qa/suites/fs/upgrade: Exclude ceph-osd-classic/crimson when installing LTS releases

In a37b5b5, the ceph-osd-classic and ceph-osd-crimson packages were
added to qa/packages/packages.yaml. The "install" task uses this file as
the default package list for all branches, including LTS releases like
Reef.

However, a37b5b5 only exists in the main branch and won't be backported
to LTS branches. This causes installation failures in the cephfs/upgrade
test suite, which verifies forward compatibility by installing LTS
releases and upgrading to latest release.

Exclude ceph-osd-classic and ceph-osd-crimson from LTS installations to
ensure the test suite can successfully install ceph.

Fixes: https://tracker.ceph.com/issues/74575
Signed-off-by: Matan Breizman <mbreizma@redhat.com>

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

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

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

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

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

diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/reef/v18.2.0.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/reef/v18.2.0.yaml
index 98bb210d180797bb698ea8d89c3f8d8b5d9045a2..b0ea9dbfab815013f66e39892f79b14e8fb2ad1c 100644 (file)
--- a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/reef/v18.2.0.yaml
+++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/reef/v18.2.0.yaml
@@ -7,6 +7,8 @@ tasks:
     tag: v18.2.0
     exclude_packages:
       - ceph-volume
+      - ceph-osd-classic
+      - ceph-osd-crimson
 - print: "**** done install task..."
 - cephadm:
     image: quay.io/ceph/ceph:v18.2.0

diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/reef/v18.2.1.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/reef/v18.2.1.yaml
index ce45d9ea9becc5d3ba16fc818755ed8579276cc2..b2c66dd12673e83dfdfff203d914650d944182cd 100644 (file)
--- a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/reef/v18.2.1.yaml
+++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/reef/v18.2.1.yaml
@@ -7,6 +7,8 @@ tasks:
     tag: v18.2.1
     exclude_packages:
       - ceph-volume
+      - ceph-osd-classic
+      - ceph-osd-crimson
 - print: "**** done install task..."
 - cephadm:
     image: quay.io/ceph/ceph:v18.2.1

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

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

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

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

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