From a05c4b7388b77e54fa7c7bb57a2486c5225ea613 Mon Sep 17 00:00:00 2001 From: Dhairya Parmar Date: Mon, 6 Nov 2023 19:54:20 +0530 Subject: [PATCH] qa: refactor client upgrade yamls and other minor touchups * start testing new_ops and stress_tests with both the drivers(i.e. fuse and kclient) therefore moved 0-clients/ from tasks/3-workload/new_ops/ to tasks/ and renamed it to 2-clients/ * since new_ops/ and stress_tests/ now share the common upgrade yaml, moved the tests yamls(in stress_tests/1-tests) directly under 3-workload/stress_tests/ * renamed 1-client-sanity.yaml in new_ops/ to newops.yaml Fixes: https://tracker.ceph.com/issues/62953 Signed-off-by: Dhairya Parmar (cherry picked from commit c556c7324763332df62f4d382da02314900f1a60) Conflicts: qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/fuse-upgrade.yaml qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/kclient.yaml qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/fuse-upgrade.yaml qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/kclient.yaml qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/1-client-sanity.yaml qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/newops.yaml qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/blogbench.yaml qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/dbench.yaml qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/fsstress.yaml qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/iozone.yaml qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/kernel_untar_build.yaml qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/blogbench.yaml qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/dbench.yaml qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/fsstress.yaml qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/iozone.yaml qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/kernel_untar_build.yaml qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/0-clients/kclient.yaml qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/1-client-sanity.yaml qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/blogbench.yaml qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/dbench.yaml qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/fsstress.yaml qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/iozone.yaml qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/kernel_untar_build.yaml qa/suites/rbd/device/workloads/.qa (cherry picked from commit 1a2e3638911d512c6fc65fcb64ecc3a869a465ad) --- .../tasks/2-clients/fuse-upgrade.yaml | 25 +++++++++++++++++++ .../0-clients => 2-clients}/kclient.yaml | 0 .../upgraded_client/tasks/2-workload/.qa | 1 - .../new_ops/0-clients/fuse-upgrade.yaml | 14 ----------- .../tasks/2-workload/stress_tests/% | 0 .../tasks/2-workload/stress_tests/.qa | 1 - .../stress_tests/0-client-upgrade.yaml | 14 ----------- .../tasks/2-workload/stress_tests/1-tests/.qa | 1 - .../upgraded_client/tasks/3-workload/.qa | 1 + .../{2-workload => 3-workload}/new_ops/% | 0 .../new_ops/newops.yaml} | 0 .../tasks/3-workload/stress_tests/.qa | 1 + .../stress_tests}/blogbench.yaml | 0 .../stress_tests}/dbench.yaml | 0 .../stress_tests}/fsstress.yaml | 0 .../stress_tests}/iozone.yaml | 0 .../stress_tests}/kernel_untar_build.yaml | 0 17 files changed, 27 insertions(+), 31 deletions(-) create mode 100644 qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/fuse-upgrade.yaml rename qa/suites/fs/upgrade/upgraded_client/tasks/{2-workload/new_ops/0-clients => 2-clients}/kclient.yaml (100%) delete mode 120000 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/.qa delete mode 100644 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/fuse-upgrade.yaml delete mode 100644 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/% delete mode 120000 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/.qa delete mode 100644 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/0-client-upgrade.yaml delete mode 120000 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/.qa create mode 120000 qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/.qa rename qa/suites/fs/upgrade/upgraded_client/tasks/{2-workload => 3-workload}/new_ops/% (100%) rename qa/suites/fs/upgrade/upgraded_client/tasks/{2-workload/new_ops/1-client-sanity.yaml => 3-workload/new_ops/newops.yaml} (100%) create mode 120000 qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/.qa rename qa/suites/fs/upgrade/upgraded_client/tasks/{2-workload/stress_tests/1-tests => 3-workload/stress_tests}/blogbench.yaml (100%) rename qa/suites/fs/upgrade/upgraded_client/tasks/{2-workload/stress_tests/1-tests => 3-workload/stress_tests}/dbench.yaml (100%) rename qa/suites/fs/upgrade/upgraded_client/tasks/{2-workload/stress_tests/1-tests => 3-workload/stress_tests}/fsstress.yaml (100%) rename qa/suites/fs/upgrade/upgraded_client/tasks/{2-workload/stress_tests/1-tests => 3-workload/stress_tests}/iozone.yaml (100%) rename qa/suites/fs/upgrade/upgraded_client/tasks/{2-workload/stress_tests/1-tests => 3-workload/stress_tests}/kernel_untar_build.yaml (100%) diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/fuse-upgrade.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/fuse-upgrade.yaml new file mode 100644 index 0000000000000..cb8ac4d4f2d12 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/fuse-upgrade.yaml @@ -0,0 +1,25 @@ +teuthology: + premerge: | + local branch = yaml.teuthology.branch + if tostring(branch) == "nautilus" then + yaml_fragment['tasks'][2]['install.upgrade']['client.0']['branch'] = "pacific" + elseif tostring(branch) == "pacific" then + yaml_fragment['tasks'][2]['install.upgrade']['client.0']['branch'] = "reef" + else + error("invalid source branch") + end + postmerge: + - if not is_fuse() then reject() end +tasks: +- ceph-fuse: + client.0: + mounted: false +- print: "**** done unmount client.0" +- install.upgrade: + client.0: + branch: [] +- print: "**** done install.upgrade on client.0" +- ceph.healthy: +- ceph-fuse: + client.0: +- print: "**** done remount client.0" diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/kclient.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/kclient.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/kclient.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/kclient.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/.qa deleted file mode 120000 index a602a0353e751..0000000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/fuse-upgrade.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/fuse-upgrade.yaml deleted file mode 100644 index 34c85a00eb5f0..0000000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/fuse-upgrade.yaml +++ /dev/null @@ -1,14 +0,0 @@ -teuthology: - postmerge: - - if not is_fuse() then reject() end -tasks: -- ceph-fuse: - client.0: - mounted: false -- print: "**** done unmount client.0" -- install.upgrade: - client.0: -- print: "**** done install.upgrade on client.0" -- ceph-fuse: - client.0: -- print: "**** done remount client" diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/% b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/.qa deleted file mode 120000 index a602a0353e751..0000000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/0-client-upgrade.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/0-client-upgrade.yaml deleted file mode 100644 index 2d948af195989..0000000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/0-client-upgrade.yaml +++ /dev/null @@ -1,14 +0,0 @@ -teuthology: - postmerge: - - if not is_fuse() then reject() end -tasks: -- ceph-fuse: - client.0: - mounted: false -- print: "**** done unmount client.0" -- install.upgrade: - client.0: -- print: "**** done install.upgrade on client.0" -- ceph-fuse: - client.0: -- print: "**** done remount client.0" diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/.qa deleted file mode 120000 index a602a0353e751..0000000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/.qa new file mode 120000 index 0000000000000..fea2489fdf6d9 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/% b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/% similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/% rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/% diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/1-client-sanity.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/newops.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/1-client-sanity.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/newops.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/.qa new file mode 120000 index 0000000000000..fea2489fdf6d9 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/blogbench.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/blogbench.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/blogbench.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/blogbench.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/dbench.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/dbench.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/dbench.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/dbench.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/fsstress.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/fsstress.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/fsstress.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/fsstress.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/iozone.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/iozone.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/iozone.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/iozone.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/kernel_untar_build.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/kernel_untar_build.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/kernel_untar_build.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/kernel_untar_build.yaml -- 2.39.5