qa: reorganize scrub/workunit tasks

So we can enforce an ordering of tasks and ensure that the fs/subvolume is available before the task runs. Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2025-01-15 07:23:16 +00:00 · 2022-06-22 10:32:55 -04:00 · 2022-06-22 10:32:55 -04:00 · e9477ae421
commit e9477ae421
parent 722b88328e
29 changed files with 2 additions and 1 deletions
--- a/qa/suites/fs/cephadm/multivolume/2-workload/dbench.yaml
+++ b/qa/suites/fs/cephadm/multivolume/2-workload/dbench.yaml
@ -1 +1 @@
-../../../workload/tasks/workunit/suites/dbench.yaml
+.qa/suites/fs/workload/tasks/3-workunit/suites/dbench.yaml
--- a/qa/suites/fs/workload/tasks/0-subvolume/$
+++ b/qa/suites/fs/workload/tasks/0-subvolume/$
--- a/qa/suites/fs/workload/tasks/0-subvolume/.qa
+++ b/qa/suites/fs/workload/tasks/0-subvolume/.qa
--- a/qa/suites/fs/workload/tasks/0-subvolume/no-subvolume.yaml
+++ b/qa/suites/fs/workload/tasks/0-subvolume/no-subvolume.yaml
--- a/qa/suites/fs/workload/tasks/0-subvolume/with-namespace-isolated-and-quota.yaml
+++ b/qa/suites/fs/workload/tasks/0-subvolume/with-namespace-isolated-and-quota.yaml
--- a/qa/suites/fs/workload/tasks/0-subvolume/with-namespace-isolated.yaml
+++ b/qa/suites/fs/workload/tasks/0-subvolume/with-namespace-isolated.yaml
--- a/qa/suites/fs/workload/tasks/0-subvolume/with-no-extra-options.yaml
+++ b/qa/suites/fs/workload/tasks/0-subvolume/with-no-extra-options.yaml
--- a/qa/suites/fs/workload/tasks/0-subvolume/with-quota.yaml
+++ b/qa/suites/fs/workload/tasks/0-subvolume/with-quota.yaml
--- a/qa/suites/fs/workload/tasks/1-check-counter.yaml
+++ b/qa/suites/fs/workload/tasks/1-check-counter.yaml
--- a/qa/suites/fs/workload/tasks/workunit/.qa
+++ b/qa/suites/fs/workload/tasks/workunit/.qa
--- a/qa/suites/fs/workload/tasks/2-scrub/no.yaml
+++ b/qa/suites/fs/workload/tasks/2-scrub/no.yaml
--- a/qa/suites/fs/workload/tasks/2-scrub/yes.yaml
+++ b/qa/suites/fs/workload/tasks/2-scrub/yes.yaml
--- a/qa/suites/fs/workload/tasks/workunit/fs/.qa
+++ b/qa/suites/fs/workload/tasks/workunit/fs/.qa
--- a/qa/suites/fs/workload/tasks/3-workunit/direct_io.yaml
+++ b/qa/suites/fs/workload/tasks/3-workunit/direct_io.yaml
--- a/qa/suites/fs/workload/tasks/workunit/suites/.qa
+++ b/qa/suites/fs/workload/tasks/workunit/suites/.qa
--- a/qa/suites/fs/workload/tasks/3-workunit/fs/misc.yaml
+++ b/qa/suites/fs/workload/tasks/3-workunit/fs/misc.yaml
--- a/qa/suites/fs/workload/tasks/3-workunit/fs/norstats.yaml
+++ b/qa/suites/fs/workload/tasks/3-workunit/fs/norstats.yaml
--- a/qa/suites/fs/workload/tasks/3-workunit/fs/test_o_trunc.yaml
+++ b/qa/suites/fs/workload/tasks/3-workunit/fs/test_o_trunc.yaml
--- a/qa/suites/fs/workload/tasks/3-workunit/kernel_untar_build.yaml
+++ b/qa/suites/fs/workload/tasks/3-workunit/kernel_untar_build.yaml
--- a/qa/suites/fs/workload/tasks/3-workunit/suites/.qa
+++ b/qa/suites/fs/workload/tasks/3-workunit/suites/.qa
@ -0,0 +1 @@
+../.qa/
--- a/qa/suites/fs/workload/tasks/3-workunit/suites/blogbench.yaml
+++ b/qa/suites/fs/workload/tasks/3-workunit/suites/blogbench.yaml
--- a/qa/suites/fs/workload/tasks/3-workunit/suites/dbench.yaml
+++ b/qa/suites/fs/workload/tasks/3-workunit/suites/dbench.yaml
--- a/qa/suites/fs/workload/tasks/3-workunit/suites/ffsb.yaml
+++ b/qa/suites/fs/workload/tasks/3-workunit/suites/ffsb.yaml
--- a/qa/suites/fs/workload/tasks/3-workunit/suites/fsstress.yaml
+++ b/qa/suites/fs/workload/tasks/3-workunit/suites/fsstress.yaml
--- a/qa/suites/fs/workload/tasks/3-workunit/suites/fsx.yaml
+++ b/qa/suites/fs/workload/tasks/3-workunit/suites/fsx.yaml
--- a/qa/suites/fs/workload/tasks/3-workunit/suites/fsync-tester.yaml
+++ b/qa/suites/fs/workload/tasks/3-workunit/suites/fsync-tester.yaml
--- a/qa/suites/fs/workload/tasks/3-workunit/suites/iogen.yaml
+++ b/qa/suites/fs/workload/tasks/3-workunit/suites/iogen.yaml
--- a/qa/suites/fs/workload/tasks/3-workunit/suites/iozone.yaml
+++ b/qa/suites/fs/workload/tasks/3-workunit/suites/iozone.yaml
--- a/qa/suites/fs/workload/tasks/3-workunit/suites/pjd.yaml
+++ b/qa/suites/fs/workload/tasks/3-workunit/suites/pjd.yaml