From: Dhairya Parmar Date: Mon, 6 Nov 2023 14:24:20 +0000 (+0530) Subject: qa: refactor client upgrade yamls and other minor touchups X-Git-Tag: v18.2.4~9 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a05c4b7388b77e54fa7c7bb57a2486c5225ea613;p=ceph-ci.git 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) --- 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 00000000000..cb8ac4d4f2d --- /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-clients/kclient.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/kclient.yaml new file mode 100644 index 00000000000..ecc705600ee --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/kclient.yaml @@ -0,0 +1,8 @@ +teuthology: + postmerge: + # Once can we make sure the distro kernels have included the newops fixes + # we can remove the is_kupstream() restriction. While since the Nautilus + # will only support the 'v1' mount syntax, so don't touch the mount syntax + # restriction. + - if not is_kupstream() or syntax_version() == 'v2' then reject() end +tasks: 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 a602a0353e7..00000000000 --- 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/% b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/% deleted file mode 100644 index e69de29bb2d..00000000000 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 34c85a00eb5..00000000000 --- 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/new_ops/0-clients/kclient.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/kclient.yaml deleted file mode 100644 index ecc705600ee..00000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/kclient.yaml +++ /dev/null @@ -1,8 +0,0 @@ -teuthology: - postmerge: - # Once can we make sure the distro kernels have included the newops fixes - # we can remove the is_kupstream() restriction. While since the Nautilus - # will only support the 'v1' mount syntax, so don't touch the mount syntax - # restriction. - - if not is_kupstream() or syntax_version() == 'v2' then reject() end -tasks: 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/2-workload/new_ops/1-client-sanity.yaml deleted file mode 100644 index 9508cce65af..00000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/1-client-sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ -tasks: - - cephfs_test_runner: - modules: - - tasks.cephfs.test_newops 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 e69de29bb2d..00000000000 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 a602a0353e7..00000000000 --- 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 2d948af1959..00000000000 --- 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 a602a0353e7..00000000000 --- 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/2-workload/stress_tests/1-tests/blogbench.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/blogbench.yaml deleted file mode 120000 index a2f8b3052a9..00000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/blogbench.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/suites/fs/workload/tasks/5-workunit/suites/blogbench.yaml \ No newline at end of file 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/2-workload/stress_tests/1-tests/dbench.yaml deleted file mode 120000 index 9fb8adcea03..00000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/dbench.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/suites/fs/workload/tasks/5-workunit/suites/dbench.yaml \ No newline at end of file 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/2-workload/stress_tests/1-tests/fsstress.yaml deleted file mode 120000 index dc777f36d33..00000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/fsstress.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/suites/fs/workload/tasks/5-workunit/suites/fsstress.yaml \ No newline at end of file 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/2-workload/stress_tests/1-tests/iozone.yaml deleted file mode 120000 index f4d0ead4f00..00000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/iozone.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/suites/fs/workload/tasks/5-workunit/suites/iozone.yaml \ No newline at end of file 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/2-workload/stress_tests/1-tests/kernel_untar_build.yaml deleted file mode 120000 index 317ebf8c42c..00000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/kernel_untar_build.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/suites/fs/workload/tasks/5-workunit/kernel_untar_build.yaml \ 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 00000000000..fea2489fdf6 --- /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/3-workload/new_ops/% b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/% new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/newops.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/newops.yaml new file mode 100644 index 00000000000..9508cce65af --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/newops.yaml @@ -0,0 +1,4 @@ +tasks: + - cephfs_test_runner: + modules: + - tasks.cephfs.test_newops 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 00000000000..fea2489fdf6 --- /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/3-workload/stress_tests/blogbench.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/blogbench.yaml new file mode 120000 index 00000000000..a2f8b3052a9 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/blogbench.yaml @@ -0,0 +1 @@ +.qa/suites/fs/workload/tasks/5-workunit/suites/blogbench.yaml \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/dbench.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/dbench.yaml new file mode 120000 index 00000000000..9fb8adcea03 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/dbench.yaml @@ -0,0 +1 @@ +.qa/suites/fs/workload/tasks/5-workunit/suites/dbench.yaml \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/fsstress.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/fsstress.yaml new file mode 120000 index 00000000000..dc777f36d33 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/fsstress.yaml @@ -0,0 +1 @@ +.qa/suites/fs/workload/tasks/5-workunit/suites/fsstress.yaml \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/iozone.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/iozone.yaml new file mode 120000 index 00000000000..f4d0ead4f00 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/iozone.yaml @@ -0,0 +1 @@ +.qa/suites/fs/workload/tasks/5-workunit/suites/iozone.yaml \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/kernel_untar_build.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/kernel_untar_build.yaml new file mode 120000 index 00000000000..317ebf8c42c --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/kernel_untar_build.yaml @@ -0,0 +1 @@ +.qa/suites/fs/workload/tasks/5-workunit/kernel_untar_build.yaml \ No newline at end of file