From 49908e15c7044e78475683aa6ccd77bd187be2f4 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Wed, 21 Jun 2023 08:08:58 -0400 Subject: [PATCH] qa/suites: install pytest for pybind tasks Signed-off-by: Casey Bodley (cherry picked from commit cbdd5209957646f497b5e0df2f1a8dc6d918267f) Conflicts: qa/suites/crimson-rados/rbd/tasks/rbd_python_api_tests.yaml does not exist on quincy --- qa/suites/crimson-rados/basic/tasks/rados_python.yaml | 4 ++++ .../rbd/tasks/rbd_python_api_tests_old_format.yaml | 4 ++++ qa/suites/fs/libcephfs/tasks/libcephfs_python.yaml | 7 +++++++ qa/suites/rados/basic/tasks/rados_python.yaml | 7 +++++++ .../rbd/basic/tasks/rbd_python_api_tests_old_format.yaml | 4 ++++ qa/suites/rbd/librbd/workloads/python_api_tests.yaml | 5 +++++ .../librbd/workloads/python_api_tests_with_defaults.yaml | 5 +++++ .../librbd/workloads/python_api_tests_with_journaling.yaml | 5 +++++ qa/suites/rbd/valgrind/workloads/python_api_tests.yaml | 5 +++++ .../valgrind/workloads/python_api_tests_with_defaults.yaml | 5 +++++ .../workloads/python_api_tests_with_journaling.yaml | 5 +++++ qa/suites/smoke/basic/tasks/test/rados_python.yaml | 5 +++++ qa/suites/smoke/basic/tasks/test/rbd_python_api_tests.yaml | 5 +++++ .../octopus-x/parallel/workload/test_rbd_python.disable | 5 +++++ .../pacific-x/parallel/workload/test_rbd_python.yaml | 5 +++++ 15 files changed, 76 insertions(+) diff --git a/qa/suites/crimson-rados/basic/tasks/rados_python.yaml b/qa/suites/crimson-rados/basic/tasks/rados_python.yaml index 0e96b30604e6a..2d7d5825017b9 100644 --- a/qa/suites/crimson-rados/basic/tasks/rados_python.yaml +++ b/qa/suites/crimson-rados/basic/tasks/rados_python.yaml @@ -8,6 +8,10 @@ overrides: - \(OSD_ - \(OBJECT_ - \(POOL_APP_NOT_ENABLED\) + install: + ceph: + extra_system_packages: + - python3-pytest tasks: - workunit: clients: diff --git a/qa/suites/crimson-rados/rbd/tasks/rbd_python_api_tests_old_format.yaml b/qa/suites/crimson-rados/rbd/tasks/rbd_python_api_tests_old_format.yaml index 441ac97279276..eae484a972842 100644 --- a/qa/suites/crimson-rados/rbd/tasks/rbd_python_api_tests_old_format.yaml +++ b/qa/suites/crimson-rados/rbd/tasks/rbd_python_api_tests_old_format.yaml @@ -3,6 +3,10 @@ overrides: log-ignorelist: - \(SLOW_OPS\) - slow request + install: + ceph: + extra_system_packages: + - python3-pytest tasks: - workunit: clients: diff --git a/qa/suites/fs/libcephfs/tasks/libcephfs_python.yaml b/qa/suites/fs/libcephfs/tasks/libcephfs_python.yaml index e5cbb14ba627c..68ccd579ca56c 100644 --- a/qa/suites/fs/libcephfs/tasks/libcephfs_python.yaml +++ b/qa/suites/fs/libcephfs/tasks/libcephfs_python.yaml @@ -3,6 +3,13 @@ overrides: disabled: true kclient: disabled: true + install: + ceph: + extra_system_packages: + deb: + - python3-pytest + rpm: + - python3-pytest tasks: - workunit: clients: diff --git a/qa/suites/rados/basic/tasks/rados_python.yaml b/qa/suites/rados/basic/tasks/rados_python.yaml index 9659094501862..6eb2f3f4f3b0d 100644 --- a/qa/suites/rados/basic/tasks/rados_python.yaml +++ b/qa/suites/rados/basic/tasks/rados_python.yaml @@ -8,6 +8,13 @@ overrides: - \(OSD_ - \(OBJECT_ - \(POOL_APP_NOT_ENABLED\) + install: + ceph: + extra_system_packages: + rpm: + - python3-pytest + deb: + - python3-pytest tasks: - workunit: clients: 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 441ac97279276..eae484a972842 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 @@ -3,6 +3,10 @@ overrides: log-ignorelist: - \(SLOW_OPS\) - slow request + install: + ceph: + extra_system_packages: + - python3-pytest 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 a7b3ce7d3e61c..516c323df8b17 100644 --- a/qa/suites/rbd/librbd/workloads/python_api_tests.yaml +++ b/qa/suites/rbd/librbd/workloads/python_api_tests.yaml @@ -1,3 +1,8 @@ +overrides: + install: + ceph: + extra_system_packages: + - python3-pytest tasks: - workunit: clients: 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 40b2312f60254..831f3762b52a1 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,3 +1,8 @@ +overrides: + install: + ceph: + extra_system_packages: + - python3-pytest tasks: - workunit: clients: 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 d0e905ff41aa6..8bd7511461731 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,3 +1,8 @@ +overrides: + install: + ceph: + extra_system_packages: + - python3-pytest 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 a7b3ce7d3e61c..516c323df8b17 100644 --- a/qa/suites/rbd/valgrind/workloads/python_api_tests.yaml +++ b/qa/suites/rbd/valgrind/workloads/python_api_tests.yaml @@ -1,3 +1,8 @@ +overrides: + install: + ceph: + extra_system_packages: + - python3-pytest tasks: - workunit: clients: 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 40b2312f60254..831f3762b52a1 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,3 +1,8 @@ +overrides: + install: + ceph: + extra_system_packages: + - python3-pytest tasks: - workunit: clients: 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 d0e905ff41aa6..8bd7511461731 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,3 +1,8 @@ +overrides: + install: + ceph: + extra_system_packages: + - python3-pytest tasks: - workunit: clients: diff --git a/qa/suites/smoke/basic/tasks/test/rados_python.yaml b/qa/suites/smoke/basic/tasks/test/rados_python.yaml index 61ea66a4bd52c..7424f2c1540f6 100644 --- a/qa/suites/smoke/basic/tasks/test/rados_python.yaml +++ b/qa/suites/smoke/basic/tasks/test/rados_python.yaml @@ -1,3 +1,8 @@ +overrides: + install: + ceph: + extra_system_packages: + - python3-pytest tasks: - ceph: log-ignorelist: diff --git a/qa/suites/smoke/basic/tasks/test/rbd_python_api_tests.yaml b/qa/suites/smoke/basic/tasks/test/rbd_python_api_tests.yaml index bb79624f2bfa9..73e64bb2c5b01 100644 --- a/qa/suites/smoke/basic/tasks/test/rbd_python_api_tests.yaml +++ b/qa/suites/smoke/basic/tasks/test/rbd_python_api_tests.yaml @@ -1,3 +1,8 @@ +overrides: + install: + ceph: + extra_system_packages: + - python3-pytest tasks: - ceph: log-ignorelist: diff --git a/qa/suites/upgrade/octopus-x/parallel/workload/test_rbd_python.disable b/qa/suites/upgrade/octopus-x/parallel/workload/test_rbd_python.disable index ac0b4cfcf47b4..e8d00f24da8f2 100644 --- a/qa/suites/upgrade/octopus-x/parallel/workload/test_rbd_python.disable +++ b/qa/suites/upgrade/octopus-x/parallel/workload/test_rbd_python.disable @@ -6,6 +6,11 @@ meta: - desc: | librbd python api tests +overrides: + install: + ceph: + extra_system_packages: + - python3-pytest workload: full_sequential: - print: "**** done start test_rbd_python.yaml" diff --git a/qa/suites/upgrade/pacific-x/parallel/workload/test_rbd_python.yaml b/qa/suites/upgrade/pacific-x/parallel/workload/test_rbd_python.yaml index c280699fc9c1b..59ed404743882 100644 --- a/qa/suites/upgrade/pacific-x/parallel/workload/test_rbd_python.yaml +++ b/qa/suites/upgrade/pacific-x/parallel/workload/test_rbd_python.yaml @@ -1,6 +1,11 @@ meta: - desc: | librbd python api tests +overrides: + install: + ceph: + extra_system_packages: + - python3-pytest workload: full_sequential: - print: "**** done start test_rbd_python.yaml" -- 2.39.5