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 <xiubli@redhat.com>
(cherry picked from commit 898316a72c6fd5729e6b574fade6ba8adc3ca25a)

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 (file)
index 99b99e6..0000000
--- 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 (symlink)
index 0000000..a602a03
--- /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 (symlink)
index 0000000..e3600f4
--- /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 (file)
index 0000000..e69de29

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 (file)
index 0000000..34c85a0
--- /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 (file)
index 0000000..ecc7056
--- /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 (file)
index 0000000..9508cce
--- /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 (file)
index 9508cce..0000000
--- 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 (file)
index 0000000..e69de29

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 (file)
index 0000000..2d948af
--- /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 (symlink)
index 0000000..a602a03
--- /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 (symlink)
index 0000000..37df46f
--- /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/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 (symlink)
index 0000000..6bab382
--- /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/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 (symlink)
index 0000000..9ef225f
--- /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/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 (symlink)
index 0000000..da59cd4
--- /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/workunit/suites/iozone.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 (symlink)
index a2f8b30..0000000
--- 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 (symlink)
index 9fb8adc..0000000
--- 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 (symlink)
index dc777f3..0000000
--- 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 (symlink)
index f4d0ead..0000000
--- 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 (symlink)
index 317ebf8..0000000
--- 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