tests: add call to fscrypt_cli_setup.sh to all fscrypt YAML files

Signed-off-by: Igor Golikov <igolikov@ibm.com>
Fixes: https://tracker.ceph.com/issues/68776

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 959adad002121132aaf79b9a72e4a8df3ea3c972..d9c4eac2d4f953a9025ff1af9460f17c572139f6 100644 (file)
--- 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 324bc64c339a27546a587b2f7c7d856943625842..22b3a859995adc07bc65eea020af50e34a121c4f 100644 (file)
--- 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 0c70fe9635ed2b3d587a70414d18f81ae3538a2d..7acf151a3a3bd18e273ae87ec327681862515ff1 100644 (file)
--- 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 5e9bb5aa312d0cb54a7d81bb5dd50780cc221d99..2c09139f7f2557806970e12102d556632d19f7f5 100644 (file)
--- 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 6d8f709bdae980d4a21ef3140a2b5a004c300fc5..76340ed2b479ae29f0c245f7e15a44073644210c 100644 (file)
--- 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