qa: switch to use the merge fragment for fscrypt

Currently only the upstream kclient will support this. Fixes: https://tracker.ceph.com/issues/59195 Signed-off-by: Xiubo Li <xiubli@redhat.com>
ceph · Mar 29, 2023 · aebf911 · aebf911
1 parent 73de0bf
commit aebf911
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 0 deletions.
diff --git a/qa/suites/fs/fscrypt/tasks/0-client.yaml 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/...ites/fs/fscrypt/tasks/fscrypt-common.yaml → ...fscrypt/tasks/1-tests/fscrypt-common.yaml b/...ites/fs/fscrypt/tasks/fscrypt-common.yaml → ...fscrypt/tasks/1-tests/fscrypt-common.yaml
diff --git a/...ites/fs/fscrypt/tasks/fscrypt-dbench.yaml → ...fscrypt/tasks/1-tests/fscrypt-dbench.yaml b/...ites/fs/fscrypt/tasks/fscrypt-dbench.yaml → ...fscrypt/tasks/1-tests/fscrypt-dbench.yaml
diff --git a/qa/suites/fs/fscrypt/tasks/fscrypt-ffsb.yaml → ...s/fscrypt/tasks/1-tests/fscrypt-ffsb.yaml b/qa/suites/fs/fscrypt/tasks/fscrypt-ffsb.yaml → ...s/fscrypt/tasks/1-tests/fscrypt-ffsb.yaml
diff --git a/...ites/fs/fscrypt/tasks/fscrypt-iozone.yaml → ...fscrypt/tasks/1-tests/fscrypt-iozone.yaml b/...ites/fs/fscrypt/tasks/fscrypt-iozone.yaml → ...fscrypt/tasks/1-tests/fscrypt-iozone.yaml
diff --git a/qa/suites/fs/fscrypt/tasks/fscrypt-pjd.yaml → ...fs/fscrypt/tasks/1-tests/fscrypt-pjd.yaml b/qa/suites/fs/fscrypt/tasks/fscrypt-pjd.yaml → ...fs/fscrypt/tasks/1-tests/fscrypt-pjd.yaml