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 <mbreizma@redhat.com>

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 b476eb7c4cd94eb9aaece56495bdda7411925998..6351d994bc4ac0c774afcb0065420347d5196169 100644 (file)
--- 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 f1e7b5d9056070a30713b1796d31749ac258c503..89771471e4142e3380ce301965cf44aaa6d51e21 100644 (file)
--- 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 6f83351d5aea7f5796578bfee9483f5f78dfe663..56418c74c78958e99001f8493b559e8ced916f8a 100644 (file)
--- 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 b5160c2dd00efd40751cbc027f4aaf17ac62b4ea..aaa2f88b4c8ef6f7bfa7e1356ece0321c9267945 100644 (file)
--- 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 53ac04719850d193d421e396bbb6a4b84b4134be..28f624e1298decf2965f890fea0a043c1947485d 100644 (file)
--- 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 ea5042ffeb718499550b818080e8d4cf5791ceb1..f16a7575dd0fd202d5cf4464d70bb850b24d6170 100644 (file)
--- 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 ec10443f9607c9b172ce1cdb3da4255ac5dfe00a..851bda33b1a591ac4f166a8f11e6f2bc72b75a83 100644 (file)
--- 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: