From e9477ae4216ebfb91d63fb5e4833a9e8527261fd Mon Sep 17 00:00:00 2001
From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 22 Jun 2022 10:32:55 -0400
Subject: [PATCH] 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>
---
 qa/suites/fs/cephadm/multivolume/2-workload/dbench.yaml         | 2 +-
 qa/suites/fs/workload/{subvolume => tasks/0-subvolume}/$        | 0
 qa/suites/fs/workload/{scrub => tasks/0-subvolume}/.qa          | 0
 .../workload/{subvolume => tasks/0-subvolume}/no-subvolume.yaml | 0
 .../0-subvolume}/with-namespace-isolated-and-quota.yaml         | 0
 .../0-subvolume}/with-namespace-isolated.yaml                   | 0
 .../{subvolume => tasks/0-subvolume}/with-no-extra-options.yaml | 0
 .../workload/{subvolume => tasks/0-subvolume}/with-quota.yaml   | 0
 .../tasks/{0-check-counter.yaml => 1-check-counter.yaml}        | 0
 qa/suites/fs/workload/tasks/{workunit => 2-scrub}/.qa           | 0
 qa/suites/fs/workload/{scrub => tasks/2-scrub}/no.yaml          | 0
 qa/suites/fs/workload/{scrub => tasks/2-scrub}/yes.yaml         | 0
 qa/suites/fs/workload/tasks/{workunit/fs => 3-workunit}/.qa     | 0
 .../fs/workload/tasks/{workunit => 3-workunit}/direct_io.yaml   | 0
 .../fs/workload/tasks/{workunit/suites => 3-workunit/fs}/.qa    | 0
 .../fs/workload/tasks/{workunit => 3-workunit}/fs/misc.yaml     | 0
 .../fs/workload/tasks/{workunit => 3-workunit}/fs/norstats.yaml | 0
 .../tasks/{workunit => 3-workunit}/fs/test_o_trunc.yaml         | 0
 .../tasks/{workunit => 3-workunit}/kernel_untar_build.yaml      | 0
 qa/suites/fs/workload/tasks/3-workunit/suites/.qa               | 1 +
 .../tasks/{workunit => 3-workunit}/suites/blogbench.yaml        | 0
 .../workload/tasks/{workunit => 3-workunit}/suites/dbench.yaml  | 0
 .../fs/workload/tasks/{workunit => 3-workunit}/suites/ffsb.yaml | 0
 .../tasks/{workunit => 3-workunit}/suites/fsstress.yaml         | 0
 .../fs/workload/tasks/{workunit => 3-workunit}/suites/fsx.yaml  | 0
 .../tasks/{workunit => 3-workunit}/suites/fsync-tester.yaml     | 0
 .../workload/tasks/{workunit => 3-workunit}/suites/iogen.yaml   | 0
 .../workload/tasks/{workunit => 3-workunit}/suites/iozone.yaml  | 0
 .../fs/workload/tasks/{workunit => 3-workunit}/suites/pjd.yaml  | 0
 29 files changed, 2 insertions(+), 1 deletion(-)
 rename qa/suites/fs/workload/{subvolume => tasks/0-subvolume}/$ (100%)
 rename qa/suites/fs/workload/{scrub => tasks/0-subvolume}/.qa (100%)
 rename qa/suites/fs/workload/{subvolume => tasks/0-subvolume}/no-subvolume.yaml (100%)
 rename qa/suites/fs/workload/{subvolume => tasks/0-subvolume}/with-namespace-isolated-and-quota.yaml (100%)
 rename qa/suites/fs/workload/{subvolume => tasks/0-subvolume}/with-namespace-isolated.yaml (100%)
 rename qa/suites/fs/workload/{subvolume => tasks/0-subvolume}/with-no-extra-options.yaml (100%)
 rename qa/suites/fs/workload/{subvolume => tasks/0-subvolume}/with-quota.yaml (100%)
 rename qa/suites/fs/workload/tasks/{0-check-counter.yaml => 1-check-counter.yaml} (100%)
 rename qa/suites/fs/workload/tasks/{workunit => 2-scrub}/.qa (100%)
 rename qa/suites/fs/workload/{scrub => tasks/2-scrub}/no.yaml (100%)
 rename qa/suites/fs/workload/{scrub => tasks/2-scrub}/yes.yaml (100%)
 rename qa/suites/fs/workload/tasks/{workunit/fs => 3-workunit}/.qa (100%)
 rename qa/suites/fs/workload/tasks/{workunit => 3-workunit}/direct_io.yaml (100%)
 rename qa/suites/fs/workload/tasks/{workunit/suites => 3-workunit/fs}/.qa (100%)
 rename qa/suites/fs/workload/tasks/{workunit => 3-workunit}/fs/misc.yaml (100%)
 rename qa/suites/fs/workload/tasks/{workunit => 3-workunit}/fs/norstats.yaml (100%)
 rename qa/suites/fs/workload/tasks/{workunit => 3-workunit}/fs/test_o_trunc.yaml (100%)
 rename qa/suites/fs/workload/tasks/{workunit => 3-workunit}/kernel_untar_build.yaml (100%)
 create mode 120000 qa/suites/fs/workload/tasks/3-workunit/suites/.qa
 rename qa/suites/fs/workload/tasks/{workunit => 3-workunit}/suites/blogbench.yaml (100%)
 rename qa/suites/fs/workload/tasks/{workunit => 3-workunit}/suites/dbench.yaml (100%)
 rename qa/suites/fs/workload/tasks/{workunit => 3-workunit}/suites/ffsb.yaml (100%)
 rename qa/suites/fs/workload/tasks/{workunit => 3-workunit}/suites/fsstress.yaml (100%)
 rename qa/suites/fs/workload/tasks/{workunit => 3-workunit}/suites/fsx.yaml (100%)
 rename qa/suites/fs/workload/tasks/{workunit => 3-workunit}/suites/fsync-tester.yaml (100%)
 rename qa/suites/fs/workload/tasks/{workunit => 3-workunit}/suites/iogen.yaml (100%)
 rename qa/suites/fs/workload/tasks/{workunit => 3-workunit}/suites/iozone.yaml (100%)
 rename qa/suites/fs/workload/tasks/{workunit => 3-workunit}/suites/pjd.yaml (100%)

diff --git a/qa/suites/fs/cephadm/multivolume/2-workload/dbench.yaml b/qa/suites/fs/cephadm/multivolume/2-workload/dbench.yaml
index f03efad814e..31d806f79bb 120000
--- 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
\ No newline at end of file
+.qa/suites/fs/workload/tasks/3-workunit/suites/dbench.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/workload/subvolume/$ b/qa/suites/fs/workload/tasks/0-subvolume/$
similarity index 100%
rename from qa/suites/fs/workload/subvolume/$
rename to qa/suites/fs/workload/tasks/0-subvolume/$
diff --git a/qa/suites/fs/workload/scrub/.qa b/qa/suites/fs/workload/tasks/0-subvolume/.qa
similarity index 100%
rename from qa/suites/fs/workload/scrub/.qa
rename to qa/suites/fs/workload/tasks/0-subvolume/.qa
diff --git a/qa/suites/fs/workload/subvolume/no-subvolume.yaml b/qa/suites/fs/workload/tasks/0-subvolume/no-subvolume.yaml
similarity index 100%
rename from qa/suites/fs/workload/subvolume/no-subvolume.yaml
rename to qa/suites/fs/workload/tasks/0-subvolume/no-subvolume.yaml
diff --git a/qa/suites/fs/workload/subvolume/with-namespace-isolated-and-quota.yaml b/qa/suites/fs/workload/tasks/0-subvolume/with-namespace-isolated-and-quota.yaml
similarity index 100%
rename from qa/suites/fs/workload/subvolume/with-namespace-isolated-and-quota.yaml
rename to qa/suites/fs/workload/tasks/0-subvolume/with-namespace-isolated-and-quota.yaml
diff --git a/qa/suites/fs/workload/subvolume/with-namespace-isolated.yaml b/qa/suites/fs/workload/tasks/0-subvolume/with-namespace-isolated.yaml
similarity index 100%
rename from qa/suites/fs/workload/subvolume/with-namespace-isolated.yaml
rename to qa/suites/fs/workload/tasks/0-subvolume/with-namespace-isolated.yaml
diff --git a/qa/suites/fs/workload/subvolume/with-no-extra-options.yaml b/qa/suites/fs/workload/tasks/0-subvolume/with-no-extra-options.yaml
similarity index 100%
rename from qa/suites/fs/workload/subvolume/with-no-extra-options.yaml
rename to qa/suites/fs/workload/tasks/0-subvolume/with-no-extra-options.yaml
diff --git a/qa/suites/fs/workload/subvolume/with-quota.yaml b/qa/suites/fs/workload/tasks/0-subvolume/with-quota.yaml
similarity index 100%
rename from qa/suites/fs/workload/subvolume/with-quota.yaml
rename to qa/suites/fs/workload/tasks/0-subvolume/with-quota.yaml
diff --git a/qa/suites/fs/workload/tasks/0-check-counter.yaml b/qa/suites/fs/workload/tasks/1-check-counter.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/0-check-counter.yaml
rename to qa/suites/fs/workload/tasks/1-check-counter.yaml
diff --git a/qa/suites/fs/workload/tasks/workunit/.qa b/qa/suites/fs/workload/tasks/2-scrub/.qa
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/.qa
rename to qa/suites/fs/workload/tasks/2-scrub/.qa
diff --git a/qa/suites/fs/workload/scrub/no.yaml b/qa/suites/fs/workload/tasks/2-scrub/no.yaml
similarity index 100%
rename from qa/suites/fs/workload/scrub/no.yaml
rename to qa/suites/fs/workload/tasks/2-scrub/no.yaml
diff --git a/qa/suites/fs/workload/scrub/yes.yaml b/qa/suites/fs/workload/tasks/2-scrub/yes.yaml
similarity index 100%
rename from qa/suites/fs/workload/scrub/yes.yaml
rename to qa/suites/fs/workload/tasks/2-scrub/yes.yaml
diff --git a/qa/suites/fs/workload/tasks/workunit/fs/.qa b/qa/suites/fs/workload/tasks/3-workunit/.qa
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/fs/.qa
rename to qa/suites/fs/workload/tasks/3-workunit/.qa
diff --git a/qa/suites/fs/workload/tasks/workunit/direct_io.yaml b/qa/suites/fs/workload/tasks/3-workunit/direct_io.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/direct_io.yaml
rename to qa/suites/fs/workload/tasks/3-workunit/direct_io.yaml
diff --git a/qa/suites/fs/workload/tasks/workunit/suites/.qa b/qa/suites/fs/workload/tasks/3-workunit/fs/.qa
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/suites/.qa
rename to qa/suites/fs/workload/tasks/3-workunit/fs/.qa
diff --git a/qa/suites/fs/workload/tasks/workunit/fs/misc.yaml b/qa/suites/fs/workload/tasks/3-workunit/fs/misc.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/fs/misc.yaml
rename to qa/suites/fs/workload/tasks/3-workunit/fs/misc.yaml
diff --git a/qa/suites/fs/workload/tasks/workunit/fs/norstats.yaml b/qa/suites/fs/workload/tasks/3-workunit/fs/norstats.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/fs/norstats.yaml
rename to qa/suites/fs/workload/tasks/3-workunit/fs/norstats.yaml
diff --git a/qa/suites/fs/workload/tasks/workunit/fs/test_o_trunc.yaml b/qa/suites/fs/workload/tasks/3-workunit/fs/test_o_trunc.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/fs/test_o_trunc.yaml
rename to qa/suites/fs/workload/tasks/3-workunit/fs/test_o_trunc.yaml
diff --git a/qa/suites/fs/workload/tasks/workunit/kernel_untar_build.yaml b/qa/suites/fs/workload/tasks/3-workunit/kernel_untar_build.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/kernel_untar_build.yaml
rename to qa/suites/fs/workload/tasks/3-workunit/kernel_untar_build.yaml
diff --git a/qa/suites/fs/workload/tasks/3-workunit/suites/.qa b/qa/suites/fs/workload/tasks/3-workunit/suites/.qa
new file mode 120000
index 00000000000..a602a0353e7
--- /dev/null
+++ b/qa/suites/fs/workload/tasks/3-workunit/suites/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/fs/workload/tasks/workunit/suites/blogbench.yaml b/qa/suites/fs/workload/tasks/3-workunit/suites/blogbench.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/suites/blogbench.yaml
rename to qa/suites/fs/workload/tasks/3-workunit/suites/blogbench.yaml
diff --git a/qa/suites/fs/workload/tasks/workunit/suites/dbench.yaml b/qa/suites/fs/workload/tasks/3-workunit/suites/dbench.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/suites/dbench.yaml
rename to qa/suites/fs/workload/tasks/3-workunit/suites/dbench.yaml
diff --git a/qa/suites/fs/workload/tasks/workunit/suites/ffsb.yaml b/qa/suites/fs/workload/tasks/3-workunit/suites/ffsb.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/suites/ffsb.yaml
rename to qa/suites/fs/workload/tasks/3-workunit/suites/ffsb.yaml
diff --git a/qa/suites/fs/workload/tasks/workunit/suites/fsstress.yaml b/qa/suites/fs/workload/tasks/3-workunit/suites/fsstress.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/suites/fsstress.yaml
rename to qa/suites/fs/workload/tasks/3-workunit/suites/fsstress.yaml
diff --git a/qa/suites/fs/workload/tasks/workunit/suites/fsx.yaml b/qa/suites/fs/workload/tasks/3-workunit/suites/fsx.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/suites/fsx.yaml
rename to qa/suites/fs/workload/tasks/3-workunit/suites/fsx.yaml
diff --git a/qa/suites/fs/workload/tasks/workunit/suites/fsync-tester.yaml b/qa/suites/fs/workload/tasks/3-workunit/suites/fsync-tester.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/suites/fsync-tester.yaml
rename to qa/suites/fs/workload/tasks/3-workunit/suites/fsync-tester.yaml
diff --git a/qa/suites/fs/workload/tasks/workunit/suites/iogen.yaml b/qa/suites/fs/workload/tasks/3-workunit/suites/iogen.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/suites/iogen.yaml
rename to qa/suites/fs/workload/tasks/3-workunit/suites/iogen.yaml
diff --git a/qa/suites/fs/workload/tasks/workunit/suites/iozone.yaml b/qa/suites/fs/workload/tasks/3-workunit/suites/iozone.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/suites/iozone.yaml
rename to qa/suites/fs/workload/tasks/3-workunit/suites/iozone.yaml
diff --git a/qa/suites/fs/workload/tasks/workunit/suites/pjd.yaml b/qa/suites/fs/workload/tasks/3-workunit/suites/pjd.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/suites/pjd.yaml
rename to qa/suites/fs/workload/tasks/3-workunit/suites/pjd.yaml