qa/suites/rbd: override extra_system_packages directly on install task

[1] and [2] added support for applying extra_system_packages overrides directly on install task, but at the same time broke our long standing workaround where we sneaked extra_system_packages directive in through an override on ceph task. This is likely getting addressed in [3], but it's better to not rely on this odd feature in the first place. [1] ceph/teuthology#1941 [2] ceph/teuthology#1943 [3] ceph/teuthology#1942 Fixes: https://tracker.ceph.com/issues/66232 Signed-off-by: Ilya Dryomov <[email protected]>
idryomov · May 27, 2024 · c61cb16 · c61cb16
1 parent 0cd602b
commit c61cb16
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 29 deletions.
diff --git a/qa/suites/rbd/basic/tasks/rbd_python_api_tests_old_format.yaml b/qa/suites/rbd/basic/tasks/rbd_python_api_tests_old_format.yaml
@@ -4,8 +4,7 @@ overrides:
       - \(SLOW_OPS\)
       - slow request
   install:
-    ceph:
-      extra_system_packages:
+    extra_system_packages:
       - python3-pytest
 tasks:
 - workunit:

diff --git a/qa/suites/rbd/device/workloads/diff-continuous-krbd.yaml b/qa/suites/rbd/device/workloads/diff-continuous-krbd.yaml
@@ -1,8 +1,7 @@
 overrides:
   install:
-    ceph:
-      extra_system_packages:
-        - pv
+    extra_system_packages:
+      - pv
 tasks:
 - workunit:
     clients:

diff --git a/qa/suites/rbd/device/workloads/diff-continuous-nbd.yaml b/qa/suites/rbd/device/workloads/diff-continuous-nbd.yaml
@@ -3,8 +3,8 @@ overrides:
     ceph:
       extra_packages:
         - rbd-nbd
-      extra_system_packages:
-        - pv
+    extra_system_packages:
+      - pv
 tasks:
 - workunit:
     clients:

diff --git a/qa/suites/rbd/librbd/workloads/python_api_tests.yaml b/qa/suites/rbd/librbd/workloads/python_api_tests.yaml
@@ -1,7 +1,6 @@
 overrides:
   install:
-    ceph:
-      extra_system_packages:
+    extra_system_packages:
       - python3-pytest
 tasks:
 - workunit:

diff --git a/qa/suites/rbd/librbd/workloads/python_api_tests_with_defaults.yaml b/qa/suites/rbd/librbd/workloads/python_api_tests_with_defaults.yaml
@@ -1,7 +1,6 @@
 overrides:
   install:
-    ceph:
-      extra_system_packages:
+    extra_system_packages:
       - python3-pytest
 tasks:
 - workunit:

diff --git a/qa/suites/rbd/librbd/workloads/python_api_tests_with_journaling.yaml b/qa/suites/rbd/librbd/workloads/python_api_tests_with_journaling.yaml
@@ -1,7 +1,6 @@
 overrides:
   install:
-    ceph:
-      extra_system_packages:
+    extra_system_packages:
       - python3-pytest
 tasks:
 - workunit:

diff --git a/qa/suites/rbd/mirror/workloads/compare-mirror-image-alternate-primary-krbd.yaml b/qa/suites/rbd/mirror/workloads/compare-mirror-image-alternate-primary-krbd.yaml
@@ -1,8 +1,7 @@
 overrides:
   install:
-    ceph:
-      extra_system_packages:
-        - pv
+    extra_system_packages:
+      - pv
 tasks:
 - workunit:
     clients:

diff --git a/qa/suites/rbd/mirror/workloads/compare-mirror-image-alternate-primary-nbd.yaml b/qa/suites/rbd/mirror/workloads/compare-mirror-image-alternate-primary-nbd.yaml
@@ -3,8 +3,8 @@ overrides:
     ceph:
       extra_packages:
         - rbd-nbd
-      extra_system_packages:
-        - pv
+    extra_system_packages:
+      - pv
 tasks:
 - workunit:
     clients:

diff --git a/qa/suites/rbd/mirror/workloads/compare-mirror-images-krbd.yaml b/qa/suites/rbd/mirror/workloads/compare-mirror-images-krbd.yaml
@@ -1,8 +1,7 @@
 overrides:
   install:
-    ceph:
-      extra_system_packages:
-        - pv
+    extra_system_packages:
+      - pv
 tasks:
 - workunit:
     clients:

diff --git a/qa/suites/rbd/mirror/workloads/compare-mirror-images-nbd.yaml b/qa/suites/rbd/mirror/workloads/compare-mirror-images-nbd.yaml
@@ -3,8 +3,8 @@ overrides:
     ceph:
       extra_packages:
         - rbd-nbd
-      extra_system_packages:
-        - pv
+    extra_system_packages:
+      - pv
 tasks:
 - workunit:
     clients:

diff --git a/qa/suites/rbd/valgrind/workloads/python_api_tests.yaml b/qa/suites/rbd/valgrind/workloads/python_api_tests.yaml
@@ -1,7 +1,6 @@
 overrides:
   install:
-    ceph:
-      extra_system_packages:
+    extra_system_packages:
       - python3-pytest
 tasks:
 - workunit:

diff --git a/qa/suites/rbd/valgrind/workloads/python_api_tests_with_defaults.yaml b/qa/suites/rbd/valgrind/workloads/python_api_tests_with_defaults.yaml
@@ -1,7 +1,6 @@
 overrides:
   install:
-    ceph:
-      extra_system_packages:
+    extra_system_packages:
       - python3-pytest
 tasks:
 - workunit:

diff --git a/qa/suites/rbd/valgrind/workloads/python_api_tests_with_journaling.yaml b/qa/suites/rbd/valgrind/workloads/python_api_tests_with_journaling.yaml
@@ -1,7 +1,6 @@
 overrides:
   install:
-    ceph:
-      extra_system_packages:
+    extra_system_packages:
       - python3-pytest
 tasks:
 - workunit: