From: Xiubo Li Date: Tue, 21 Mar 2023 01:51:49 +0000 (+0800) Subject: qa: enable kclient test for newop test X-Git-Tag: v19.0.0~1501^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F48183%2Fhead;p=ceph.git qa: enable kclient test for newop test The kclient have already fix this. This will only enable the upstream kclient with the testing branch, the downstream ones may not include the fixing yet, so skip them for now. The nautilus will only support the syntax v1. And for kclient there is not need to do the upgrade. Fixes: https://tracker.ceph.com/issues/57591 Signed-off-by: Xiubo Li --- diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/1-client-upgrade.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/1-client-upgrade.yaml deleted file mode 100644 index 99b99e642aaa..000000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/1-client-upgrade.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- 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/1-mount/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/1-mount/.qa new file mode 120000 index 000000000000..a602a0353e75 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/1-mount/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/1-mount/mount b/qa/suites/fs/upgrade/upgraded_client/tasks/1-mount/mount new file mode 120000 index 000000000000..e3600f453f2f --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/1-mount/mount @@ -0,0 +1 @@ +.qa/cephfs/mount/ \ 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/% new file mode 100644 index 000000000000..e69de29bb2d1 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 new file mode 100644 index 000000000000..34c85a00eb5f --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/fuse-upgrade.yaml @@ -0,0 +1,14 @@ +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 new file mode 100644 index 000000000000..ecc705600ee9 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-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/new_ops/1-client-sanity.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/1-client-sanity.yaml new file mode 100644 index 000000000000..9508cce65aff --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/1-client-sanity.yaml @@ -0,0 +1,4 @@ +tasks: + - cephfs_test_runner: + modules: + - tasks.cephfs.test_newops diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/client-sanity.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/client-sanity.yaml deleted file mode 100644 index 9508cce65aff..000000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/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/% new file mode 100644 index 000000000000..e69de29bb2d1 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 new file mode 100644 index 000000000000..2d948af19598 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/0-client-upgrade.yaml @@ -0,0 +1,14 @@ +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 new file mode 120000 index 000000000000..a602a0353e75 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-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/2-workload/stress_tests/1-tests/blogbench.yaml new file mode 120000 index 000000000000..a2f8b3052a92 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-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/2-workload/stress_tests/1-tests/dbench.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/dbench.yaml new file mode 120000 index 000000000000..9fb8adcea03e --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-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/2-workload/stress_tests/1-tests/fsstress.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/fsstress.yaml new file mode 120000 index 000000000000..dc777f36d33c --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-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/2-workload/stress_tests/1-tests/iozone.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/iozone.yaml new file mode 120000 index 000000000000..f4d0ead4f00a --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-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/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 new file mode 120000 index 000000000000..317ebf8c42c5 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-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 diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/blogbench.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/blogbench.yaml deleted file mode 120000 index a2f8b3052a92..000000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_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/dbench.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/dbench.yaml deleted file mode 120000 index 9fb8adcea03e..000000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_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/fsstress.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/fsstress.yaml deleted file mode 120000 index dc777f36d33c..000000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_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/iozone.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/iozone.yaml deleted file mode 120000 index f4d0ead4f00a..000000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_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/kernel_untar_build.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/kernel_untar_build.yaml deleted file mode 120000 index 317ebf8c42c5..000000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_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