From: Alex Ainscow <aainscow@uk.ibm.com>
Date: Thu, 26 Mar 2026 14:21:41 +0000 (+0000)
Subject: qa: Exclude missing ceph-osd-classic and ceph-osd-crimson from tentacle installs.
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8ee4ca1c2161cdfc21bb458c097cc400341bdfcf;p=ceph.git

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 0be92c38da3c..1014565c3c1e 100644
--- 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 04da86ec97a3..fcae62244cb7 100644
--- 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 0be92c38da3c..1014565c3c1e 100644
--- 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 c17ee996a229..28c56bab573b 100644
--- 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