From 04fab9b5f967eab51beef5429e2b6317909bde38 Mon Sep 17 00:00:00 2001 From: Xiubo Li Date: Wed, 29 Mar 2023 13:04:47 +0800 Subject: [PATCH] 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 --- qa/suites/fs/fscrypt/tasks/% | 0 qa/suites/fs/fscrypt/tasks/0-client.yaml | 7 +++++++ .../fs/fscrypt/tasks/{ => 1-tests}/fscrypt-common.yaml | 0 .../fs/fscrypt/tasks/{ => 1-tests}/fscrypt-dbench.yaml | 0 qa/suites/fs/fscrypt/tasks/{ => 1-tests}/fscrypt-ffsb.yaml | 0 .../fs/fscrypt/tasks/{ => 1-tests}/fscrypt-iozone.yaml | 0 qa/suites/fs/fscrypt/tasks/{ => 1-tests}/fscrypt-pjd.yaml | 0 7 files changed, 7 insertions(+) create mode 100644 qa/suites/fs/fscrypt/tasks/% create mode 100644 qa/suites/fs/fscrypt/tasks/0-client.yaml rename qa/suites/fs/fscrypt/tasks/{ => 1-tests}/fscrypt-common.yaml (100%) rename qa/suites/fs/fscrypt/tasks/{ => 1-tests}/fscrypt-dbench.yaml (100%) rename qa/suites/fs/fscrypt/tasks/{ => 1-tests}/fscrypt-ffsb.yaml (100%) rename qa/suites/fs/fscrypt/tasks/{ => 1-tests}/fscrypt-iozone.yaml (100%) rename qa/suites/fs/fscrypt/tasks/{ => 1-tests}/fscrypt-pjd.yaml (100%) diff --git a/qa/suites/fs/fscrypt/tasks/% b/qa/suites/fs/fscrypt/tasks/% new file mode 100644 index 00000000000..e69de29bb2d 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 00000000000..ed20ce90782 --- /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/fscrypt-common.yaml b/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-common.yaml similarity index 100% rename from qa/suites/fs/fscrypt/tasks/fscrypt-common.yaml rename to qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-common.yaml diff --git a/qa/suites/fs/fscrypt/tasks/fscrypt-dbench.yaml b/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-dbench.yaml similarity index 100% rename from qa/suites/fs/fscrypt/tasks/fscrypt-dbench.yaml rename to qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-dbench.yaml diff --git a/qa/suites/fs/fscrypt/tasks/fscrypt-ffsb.yaml b/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-ffsb.yaml similarity index 100% rename from qa/suites/fs/fscrypt/tasks/fscrypt-ffsb.yaml rename to qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-ffsb.yaml diff --git a/qa/suites/fs/fscrypt/tasks/fscrypt-iozone.yaml b/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-iozone.yaml similarity index 100% rename from qa/suites/fs/fscrypt/tasks/fscrypt-iozone.yaml rename to qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-iozone.yaml diff --git a/qa/suites/fs/fscrypt/tasks/fscrypt-pjd.yaml b/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-pjd.yaml similarity index 100% rename from qa/suites/fs/fscrypt/tasks/fscrypt-pjd.yaml rename to qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-pjd.yaml