From 84d4206c2dfb4f89f28e7326a4369f6ee66b291c Mon Sep 17 00:00:00 2001 From: Matan Breizman Date: Sun, 16 Nov 2025 12:52:05 +0000 Subject: [PATCH] qa/suites: exclude ceph-osd-classic a37b5b5bde8c2e8d6890f16b31046119ed55f25d added ceph-osd-classic package. old-clients and upgrade tests should not try to install the new package as it is not available in older releases. Fixes: https://tracker.ceph.com/issues/73848 Signed-off-by: Matan Breizman --- qa/suites/rados/thrash-old-clients/1-install/reef.yaml | 1 + qa/suites/rados/thrash-old-clients/1-install/squid.yaml | 1 + qa/suites/rados/thrash-old-clients/1-install/tentacle.yaml | 1 + qa/suites/upgrade/reef-x/parallel/1-tasks.yaml | 1 + qa/suites/upgrade/reef-x/stress-split/1-start.yaml | 1 + qa/suites/upgrade/squid-x/parallel/1-tasks.yaml | 1 + qa/suites/upgrade/squid-x/stress-split/1-start.yaml | 1 + 7 files changed, 7 insertions(+) diff --git a/qa/suites/rados/thrash-old-clients/1-install/reef.yaml b/qa/suites/rados/thrash-old-clients/1-install/reef.yaml index b476eb7c4cd94..6351d994bc4ac 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/reef.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/reef.yaml @@ -10,6 +10,7 @@ tasks: - ceph-mgr-diskprediction-local - ceph-mgr-rook - ceph-mgr-cephadm + - ceph-osd-classic - ceph-base-debuginfo - ceph-common-debuginfo - ceph-immutable-object-cache-debuginfo diff --git a/qa/suites/rados/thrash-old-clients/1-install/squid.yaml b/qa/suites/rados/thrash-old-clients/1-install/squid.yaml index f1e7b5d905607..89771471e4142 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/squid.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/squid.yaml @@ -10,6 +10,7 @@ tasks: - ceph-mgr-diskprediction-local - ceph-mgr-rook - ceph-mgr-cephadm + - ceph-osd-classic - ceph-base-debuginfo - ceph-common-debuginfo - ceph-immutable-object-cache-debuginfo diff --git a/qa/suites/rados/thrash-old-clients/1-install/tentacle.yaml b/qa/suites/rados/thrash-old-clients/1-install/tentacle.yaml index 6f83351d5aea7..56418c74c7895 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/tentacle.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/tentacle.yaml @@ -10,6 +10,7 @@ tasks: - ceph-mgr-diskprediction-local - ceph-mgr-rook - ceph-mgr-cephadm + - ceph-osd-classic - ceph-base-debuginfo - ceph-common-debuginfo - ceph-immutable-object-cache-debuginfo diff --git a/qa/suites/upgrade/reef-x/parallel/1-tasks.yaml b/qa/suites/upgrade/reef-x/parallel/1-tasks.yaml index b5160c2dd00ef..aaa2f88b4c8ef 100644 --- a/qa/suites/upgrade/reef-x/parallel/1-tasks.yaml +++ b/qa/suites/upgrade/reef-x/parallel/1-tasks.yaml @@ -7,6 +7,7 @@ tasks: - install: branch: reef exclude_packages: + - ceph-osd-classic - ceph-volume - print: "**** done install task..." - print: "**** done start installing reef cephadm ..." diff --git a/qa/suites/upgrade/reef-x/stress-split/1-start.yaml b/qa/suites/upgrade/reef-x/stress-split/1-start.yaml index 53ac04719850d..28f624e1298de 100644 --- a/qa/suites/upgrade/reef-x/stress-split/1-start.yaml +++ b/qa/suites/upgrade/reef-x/stress-split/1-start.yaml @@ -31,6 +31,7 @@ tasks: branch: reef exclude_packages: - ceph-volume + - ceph-osd-classic - cephadm: image: quay.ceph.io/ceph-ci/ceph:reef diff --git a/qa/suites/upgrade/squid-x/parallel/1-tasks.yaml b/qa/suites/upgrade/squid-x/parallel/1-tasks.yaml index ea5042ffeb718..f16a7575dd0fd 100644 --- a/qa/suites/upgrade/squid-x/parallel/1-tasks.yaml +++ b/qa/suites/upgrade/squid-x/parallel/1-tasks.yaml @@ -7,6 +7,7 @@ tasks: - install: branch: squid exclude_packages: + - ceph-osd-classic - ceph-volume - print: "**** done install task..." - print: "**** done start installing squid cephadm ..." diff --git a/qa/suites/upgrade/squid-x/stress-split/1-start.yaml b/qa/suites/upgrade/squid-x/stress-split/1-start.yaml index ec10443f9607c..851bda33b1a59 100644 --- a/qa/suites/upgrade/squid-x/stress-split/1-start.yaml +++ b/qa/suites/upgrade/squid-x/stress-split/1-start.yaml @@ -29,6 +29,7 @@ tasks: - install: branch: squid exclude_packages: + - ceph-osd-classic - ceph-volume - cephadm: -- 2.39.5