qa: Exclude missing ceph-osd-classic and ceph-osd-crimson from tentacle installs.

The upgrade from tentacle builds were failing because the system was attempting
to install packages whose names were changed in Umbrella.

We use the same workaround previously used for squid.

Fixes: https://tracker.ceph.com/issues/75730
Signed-off-by: Alex Ainscow <aainscow@uk.ibm.com>

diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-from/tentacle.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-from/tentacle.yaml
index 0be92c38da3c3a61e2c0c5c6fba517313ecce3a9..1014565c3c1ebdb58384ff53b4f55c8fd8e598cb 100644 (file)
--- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-from/tentacle.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-from/tentacle.yaml
@@ -12,6 +12,8 @@ tasks:
       - ceph-mgr-cephadm
       - cephadm
       - ceph-volume
+      - ceph-osd-classic
+      - ceph-osd-crimson
     extra_packages: ['librados2']
 - print: "**** done installing tentacle"
 - ceph:

diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/tentacle.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/tentacle.yaml
index 04da86ec97a34877b627145d0c7d6a5f15a646cf..fcae62244cb7558f365be98950fe500f17a98d5e 100644 (file)
--- a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/tentacle.yaml
+++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/tentacle.yaml
@@ -7,6 +7,8 @@ tasks:
     branch: tentacle
     exclude_packages:
       - ceph-volume
+      - ceph-osd-classic
+      - ceph-osd-crimson
 - print: "**** done install task..."
 - cephadm:
     image: quay.ceph.io/ceph-ci/ceph:tentacle

diff --git a/qa/suites/fs/upgrade/nofs/tasks/0-from/tentacle.yaml b/qa/suites/fs/upgrade/nofs/tasks/0-from/tentacle.yaml
index 0be92c38da3c3a61e2c0c5c6fba517313ecce3a9..1014565c3c1ebdb58384ff53b4f55c8fd8e598cb 100644 (file)
--- a/qa/suites/fs/upgrade/nofs/tasks/0-from/tentacle.yaml
+++ b/qa/suites/fs/upgrade/nofs/tasks/0-from/tentacle.yaml
@@ -12,6 +12,8 @@ tasks:
       - ceph-mgr-cephadm
       - cephadm
       - ceph-volume
+      - ceph-osd-classic
+      - ceph-osd-crimson
     extra_packages: ['librados2']
 - print: "**** done installing tentacle"
 - ceph:

diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/0-install/tentacle.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/0-install/tentacle.yaml
index c17ee996a2295d118d7abe8a8cf1f86680d74a03..28c56bab573b2d5cf9ae47d02b2f824be02b7482 100644 (file)
--- a/qa/suites/fs/upgrade/upgraded_client/tasks/0-install/tentacle.yaml
+++ b/qa/suites/fs/upgrade/upgraded_client/tasks/0-install/tentacle.yaml
@@ -13,6 +13,8 @@ tasks:
       - python3-rbd
       - python3-cephfs
       - ceph-volume
+      - ceph-osd-classic
+      - ceph-osd-crimson
     extra_packages:
       - python-rados
       - python-rgw