From d07746760f94711553d51bf1ee771add45f06819 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Mon, 27 May 2024 15:56:26 +0200 Subject: [PATCH] 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] https://github.com/ceph/teuthology/pull/1941 [2] https://github.com/ceph/teuthology/pull/1943 [3] https://github.com/ceph/teuthology/pull/1942 Fixes: https://tracker.ceph.com/issues/66232 Signed-off-by: Ilya Dryomov (cherry picked from commit c61cb16223fa5a93ab660c4287800b0d22f4c079) --- .../rbd/basic/tasks/rbd_python_api_tests_old_format.yaml | 3 +-- qa/suites/rbd/device/workloads/diff-continuous-krbd.yaml | 5 ++--- qa/suites/rbd/device/workloads/diff-continuous-nbd.yaml | 4 ++-- qa/suites/rbd/librbd/workloads/python_api_tests.yaml | 3 +-- .../rbd/librbd/workloads/python_api_tests_with_defaults.yaml | 3 +-- .../librbd/workloads/python_api_tests_with_journaling.yaml | 3 +-- .../compare-mirror-image-alternate-primary-krbd.yaml | 5 ++--- .../compare-mirror-image-alternate-primary-nbd.yaml | 4 ++-- .../rbd/mirror/workloads/compare-mirror-images-krbd.yaml | 5 ++--- .../rbd/mirror/workloads/compare-mirror-images-nbd.yaml | 4 ++-- qa/suites/rbd/valgrind/workloads/python_api_tests.yaml | 3 +-- .../valgrind/workloads/python_api_tests_with_defaults.yaml | 3 +-- .../valgrind/workloads/python_api_tests_with_journaling.yaml | 3 +-- 13 files changed, 19 insertions(+), 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 index eae484a972842..87d75aa426307 100644 --- 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 index 5907718d508fd..5ac6774e39736 100644 --- 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 index e0a7ebe335a07..0c2ac6758e2f2 100644 --- 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 index 516c323df8b17..6005b6a2e504c 100644 --- 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 index 831f3762b52a1..69fa9f5c5f3e9 100644 --- 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 index 8bd7511461731..f64d448b8a33d 100644 --- 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 index 771400d01eed6..5e62821c24aa2 100644 --- 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 index e87d0e8cecc69..567ff39ac8a5c 100644 --- 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 index fc161987f7bd2..69e3d1648ab9f 100644 --- 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 index ed02ed25702fb..ee268d5e0bfe8 100644 --- 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 index 516c323df8b17..6005b6a2e504c 100644 --- 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 index 831f3762b52a1..69fa9f5c5f3e9 100644 --- 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 index 8bd7511461731..f64d448b8a33d 100644 --- 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: