From e1e2fbae176a36c2211b9f55058cbd13880c8fc0 Mon Sep 17 00:00:00 2001 From: Igor Golikov Date: Thu, 20 Feb 2025 18:27:06 +0200 Subject: [PATCH] tests: add call to fscrypt_cli_setup.sh to all fscrypt YAML files Signed-off-by: Igor Golikov Fixes: https://tracker.ceph.com/issues/68776 --- .../fs/fscrypt/tasks/1-tests/fscrypt-common.yaml | 12 ++++++++---- .../fs/fscrypt/tasks/1-tests/fscrypt-dbench.yaml | 1 + qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-ffsb.yaml | 1 + .../fs/fscrypt/tasks/1-tests/fscrypt-iozone.yaml | 1 + qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-pjd.yaml | 1 + 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-common.yaml b/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-common.yaml index 959adad002121..d9c4eac2d4f95 100644 --- a/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-common.yaml +++ b/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-common.yaml @@ -1,12 +1,16 @@ overrides: install: + # Remove package manager installation of fscrypt extra_system_packages: - rpm: - - fscrypt - deb: - - fscrypt + rpm: [] + deb: [] tasks: + - workunit: + clients: + all: + - fs/fscrypt_cli_setup.sh - cephfs_test_runner: fail_on_skip: false modules: - tasks.cephfs.test_fscrypt + \ No newline at end of file diff --git a/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-dbench.yaml b/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-dbench.yaml index 324bc64c339a2..22b3a859995ad 100644 --- a/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-dbench.yaml +++ b/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-dbench.yaml @@ -3,5 +3,6 @@ tasks: timeout: 6h clients: client.0: + - fs/fscrypt_cli_setup.sh - 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 index 0c70fe9635ed2..7acf151a3a3bd 100644 --- a/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-ffsb.yaml +++ b/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-ffsb.yaml @@ -3,5 +3,6 @@ tasks: timeout: 6h clients: client.0: + - fs/fscrypt_cli_setup.sh - 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 index 5e9bb5aa312d0..2c09139f7f255 100644 --- a/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-iozone.yaml +++ b/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-iozone.yaml @@ -3,5 +3,6 @@ tasks: timeout: 6h clients: client.0: + - fs/fscrypt_cli_setup.sh - 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 index 6d8f709bdae98..76340ed2b479a 100644 --- a/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-pjd.yaml +++ b/qa/suites/fs/fscrypt/tasks/1-tests/fscrypt-pjd.yaml @@ -3,5 +3,6 @@ tasks: timeout: 6h clients: client.0: + - fs/fscrypt_cli_setup.sh - fs/fscrypt.sh none pjd - fs/fscrypt.sh unlocked pjd -- 2.39.5