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 <[email protected]>
mitsu-ko · Mar 29, 2023 · 898316a · 898316a
1 parent be9c845
commit 898316a
Show file tree

Hide file tree

Showing 14 changed files with 32 additions and 0 deletions.
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/1-mount/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/1-mount/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/1-mount/mount b/qa/suites/fs/upgrade/upgraded_client/tasks/1-mount/mount
@@ -0,0 +1 @@
+.qa/cephfs/mount/
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/%
diff --git a/...graded_client/tasks/1-client-upgrade.yaml → ...kload/new_ops/0-clients/fuse-upgrade.yaml b/...graded_client/tasks/1-client-upgrade.yaml → ...kload/new_ops/0-clients/fuse-upgrade.yaml
@@ -1,4 +1,11 @@
+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"

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
@@ -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/...sks/2-workload/new_ops/client-sanity.yaml → ...s/2-workload/new_ops/1-client-sanity.yaml b/...sks/2-workload/new_ops/client-sanity.yaml → ...s/2-workload/new_ops/1-client-sanity.yaml
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/%
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
@@ -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
@@ -0,0 +1 @@
+../.qa/
diff --git a/...ks/2-workload/stress_tests/blogbench.yaml → ...kload/stress_tests/1-tests/blogbench.yaml b/...ks/2-workload/stress_tests/blogbench.yaml → ...kload/stress_tests/1-tests/blogbench.yaml
diff --git a/...tasks/2-workload/stress_tests/dbench.yaml → ...workload/stress_tests/1-tests/dbench.yaml b/...tasks/2-workload/stress_tests/dbench.yaml → ...workload/stress_tests/1-tests/dbench.yaml
diff --git a/...sks/2-workload/stress_tests/fsstress.yaml → ...rkload/stress_tests/1-tests/fsstress.yaml b/...sks/2-workload/stress_tests/fsstress.yaml → ...rkload/stress_tests/1-tests/fsstress.yaml
diff --git a/...tasks/2-workload/stress_tests/iozone.yaml → ...workload/stress_tests/1-tests/iozone.yaml b/...tasks/2-workload/stress_tests/iozone.yaml → ...workload/stress_tests/1-tests/iozone.yaml
diff --git a/...load/stress_tests/kernel_untar_build.yaml → ...ess_tests/1-tests/kernel_untar_build.yaml b/...load/stress_tests/kernel_untar_build.yaml → ...ess_tests/1-tests/kernel_untar_build.yaml