From: Xiubo Li <xiubli@redhat.com>
Date: Wed, 29 Mar 2023 05:04:47 +0000 (+0800)
Subject: qa: switch to use the merge fragment for fscrypt
X-Git-Tag: v18.2.5~589^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F55857%2Fhead;p=ceph.git

qa: switch to use the merge fragment for fscrypt

Currently only the upstream kclient supports fscrypt feature.

Fixes: https://tracker.ceph.com/issues/59195
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 04fab9b5f967eab51beef5429e2b6317909bde38)
---

diff --git a/qa/suites/fs/fscrypt/tasks/% b/qa/suites/fs/fscrypt/tasks/%
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/qa/suites/fs/fscrypt/tasks/0-client.yaml b/qa/suites/fs/fscrypt/tasks/0-client.yaml
new file mode 100644
index 000000000000..ed20ce907829
--- /dev/null
+++ b/qa/suites/fs/fscrypt/tasks/0-client.yaml
@@ -0,0 +1,7 @@
+teuthology:
+  postmerge:
+    # Once can we make sure the distro kernels have included the fscrypt feature
+    # or the ceph-fuse have supported the fscrypt feature we can remove this
+    # restriction.
+    - if not is_kupstream() then reject() end
+task:
diff --git a/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-common.yaml b/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-common.yaml
new file mode 100644
index 000000000000..5cb34d9818e9
--- /dev/null
+++ b/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-common.yaml
@@ -0,0 +1,5 @@
+tasks:
+  - cephfs_test_runner:
+      fail_on_skip: false
+      modules:
+        - tasks.cephfs.test_fscrypt
diff --git a/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-dbench.yaml b/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-dbench.yaml
new file mode 100644
index 000000000000..324bc64c339a
--- /dev/null
+++ b/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-dbench.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+    timeout: 6h
+    clients:
+      client.0:
+        - fs/fscrypt.sh none dbench
+        - fs/fscrypt.sh unlocked dbench
diff --git a/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-ffsb.yaml b/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-ffsb.yaml
new file mode 100644
index 000000000000..0c70fe9635ed
--- /dev/null
+++ b/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-ffsb.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+    timeout: 6h
+    clients:
+      client.0:
+        - fs/fscrypt.sh none ffsb
+        - fs/fscrypt.sh unlocked ffsb
diff --git a/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-iozone.yaml b/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-iozone.yaml
new file mode 100644
index 000000000000..5e9bb5aa312d
--- /dev/null
+++ b/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-iozone.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+    timeout: 6h
+    clients:
+      client.0:
+        - fs/fscrypt.sh none iozone
+        - fs/fscrypt.sh unlocked iozone
diff --git a/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-pjd.yaml b/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-pjd.yaml
new file mode 100644
index 000000000000..6d8f709bdae9
--- /dev/null
+++ b/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-pjd.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+    timeout: 6h
+    clients:
+      client.0:
+        - fs/fscrypt.sh none pjd
+        - fs/fscrypt.sh unlocked pjd
diff --git a/qa/suites/fs/fscrypt/tasks/fscrypt-common.yaml b/qa/suites/fs/fscrypt/tasks/fscrypt-common.yaml
deleted file mode 100644
index 5cb34d9818e9..000000000000
--- a/qa/suites/fs/fscrypt/tasks/fscrypt-common.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-  - cephfs_test_runner:
-      fail_on_skip: false
-      modules:
-        - tasks.cephfs.test_fscrypt
diff --git a/qa/suites/fs/fscrypt/tasks/fscrypt-dbench.yaml b/qa/suites/fs/fscrypt/tasks/fscrypt-dbench.yaml
deleted file mode 100644
index 324bc64c339a..000000000000
--- a/qa/suites/fs/fscrypt/tasks/fscrypt-dbench.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- workunit:
-    timeout: 6h
-    clients:
-      client.0:
-        - fs/fscrypt.sh none dbench
-        - fs/fscrypt.sh unlocked dbench
diff --git a/qa/suites/fs/fscrypt/tasks/fscrypt-ffsb.yaml b/qa/suites/fs/fscrypt/tasks/fscrypt-ffsb.yaml
deleted file mode 100644
index 0c70fe9635ed..000000000000
--- a/qa/suites/fs/fscrypt/tasks/fscrypt-ffsb.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- workunit:
-    timeout: 6h
-    clients:
-      client.0:
-        - fs/fscrypt.sh none ffsb
-        - fs/fscrypt.sh unlocked ffsb
diff --git a/qa/suites/fs/fscrypt/tasks/fscrypt-iozone.yaml b/qa/suites/fs/fscrypt/tasks/fscrypt-iozone.yaml
deleted file mode 100644
index 5e9bb5aa312d..000000000000
--- a/qa/suites/fs/fscrypt/tasks/fscrypt-iozone.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- workunit:
-    timeout: 6h
-    clients:
-      client.0:
-        - fs/fscrypt.sh none iozone
-        - fs/fscrypt.sh unlocked iozone
diff --git a/qa/suites/fs/fscrypt/tasks/fscrypt-pjd.yaml b/qa/suites/fs/fscrypt/tasks/fscrypt-pjd.yaml
deleted file mode 100644
index 6d8f709bdae9..000000000000
--- a/qa/suites/fs/fscrypt/tasks/fscrypt-pjd.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- workunit:
-    timeout: 6h
-    clients:
-      client.0:
-        - fs/fscrypt.sh none pjd
-        - fs/fscrypt.sh unlocked pjd