Skip to content

Commit c61cb16

Browse files
idryomovidryomov
committed
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]>
1 parent 0cd602b commit c61cb16

13 files changed

+19
-29
lines changed

‎qa/suites/rbd/basic/tasks/rbd_python_api_tests_old_format.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ overrides:
44
- \(SLOW_OPS\)
55
- slow request
66
install:
7-
ceph:
8-
extra_system_packages:
7+
extra_system_packages:
98
- python3-pytest
109
tasks:
1110
- workunit:

‎qa/suites/rbd/device/workloads/diff-continuous-krbd.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
overrides:
22
install:
3-
ceph:
4-
extra_system_packages:
5-
- pv
3+
extra_system_packages:
4+
- pv
65
tasks:
76
- workunit:
87
clients:

‎qa/suites/rbd/device/workloads/diff-continuous-nbd.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ overrides:
33
ceph:
44
extra_packages:
55
- rbd-nbd
6-
extra_system_packages:
7-
- pv
6+
extra_system_packages:
7+
- pv
88
tasks:
99
- workunit:
1010
clients:

‎qa/suites/rbd/librbd/workloads/python_api_tests.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
overrides:
22
install:
3-
ceph:
4-
extra_system_packages:
3+
extra_system_packages:
54
- python3-pytest
65
tasks:
76
- workunit:

‎qa/suites/rbd/librbd/workloads/python_api_tests_with_defaults.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
overrides:
22
install:
3-
ceph:
4-
extra_system_packages:
3+
extra_system_packages:
54
- python3-pytest
65
tasks:
76
- workunit:

‎qa/suites/rbd/librbd/workloads/python_api_tests_with_journaling.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
overrides:
22
install:
3-
ceph:
4-
extra_system_packages:
3+
extra_system_packages:
54
- python3-pytest
65
tasks:
76
- workunit:

‎qa/suites/rbd/mirror/workloads/compare-mirror-image-alternate-primary-krbd.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
overrides:
22
install:
3-
ceph:
4-
extra_system_packages:
5-
- pv
3+
extra_system_packages:
4+
- pv
65
tasks:
76
- workunit:
87
clients:

‎qa/suites/rbd/mirror/workloads/compare-mirror-image-alternate-primary-nbd.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ overrides:
33
ceph:
44
extra_packages:
55
- rbd-nbd
6-
extra_system_packages:
7-
- pv
6+
extra_system_packages:
7+
- pv
88
tasks:
99
- workunit:
1010
clients:

‎qa/suites/rbd/mirror/workloads/compare-mirror-images-krbd.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
overrides:
22
install:
3-
ceph:
4-
extra_system_packages:
5-
- pv
3+
extra_system_packages:
4+
- pv
65
tasks:
76
- workunit:
87
clients:

‎qa/suites/rbd/mirror/workloads/compare-mirror-images-nbd.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ overrides:
33
ceph:
44
extra_packages:
55
- rbd-nbd
6-
extra_system_packages:
7-
- pv
6+
extra_system_packages:
7+
- pv
88
tasks:
99
- workunit:
1010
clients:

0 commit comments

Comments
 (0)