From b7086964e4e8e523883ee563af2c1775442c926d Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Sat, 7 Feb 2026 16:45:22 -0500 Subject: [PATCH] qa: update fs:upgrade to N-2 release for U Signed-off-by: Patrick Donnelly --- .../tasks/0-from/{reef.yaml => tentacle.yaml} | 8 +-- .../tasks/0-from/{reef.yaml => tentacle.yaml} | 8 +-- .../tasks/0-from/tentacle.yaml} | 8 +-- .../upgrade/nofs/tasks/0-from/tentacle.yaml | 39 +++++++++++++ .../upgraded_client/tasks/0-install/reef.yaml | 55 ------------------- .../tasks/0-install/tentacle.yaml | 40 ++++++++++++++ 6 files changed, 91 insertions(+), 67 deletions(-) rename qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-from/{reef.yaml => tentacle.yaml} (83%) rename qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-from/{reef.yaml => tentacle.yaml} (83%) rename qa/suites/fs/upgrade/{nofs/tasks/0-from/reef.yaml => mds_upgrade_sequence/tasks/0-from/tentacle.yaml} (83%) create mode 100644 qa/suites/fs/upgrade/nofs/tasks/0-from/tentacle.yaml delete mode 100644 qa/suites/fs/upgrade/upgraded_client/tasks/0-install/reef.yaml create mode 100644 qa/suites/fs/upgrade/upgraded_client/tasks/0-install/tentacle.yaml 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/tentacle.yaml similarity index 83% rename from qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-from/reef.yaml rename to qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-from/tentacle.yaml index ddccab4b964..1014565c3c1 100644 --- 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/tentacle.yaml @@ -1,9 +1,9 @@ meta: - desc: | - install ceph/reef latest + install ceph/tentacle latest tasks: - install: - branch: reef + branch: tentacle exclude_packages: - librados3 - ceph-mgr-dashboard @@ -15,7 +15,7 @@ tasks: - ceph-osd-classic - ceph-osd-crimson extra_packages: ['librados2'] -- print: "**** done installing reef" +- print: "**** done installing tentacle" - ceph: log-ignorelist: - overall HEALTH_ @@ -37,5 +37,5 @@ tasks: ms bind msgr2: false - exec: osd.0: - - ceph osd set-require-min-compat-client reef + - ceph osd set-require-min-compat-client tentacle - print: "**** done 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/tentacle.yaml similarity index 83% rename from qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-from/reef.yaml rename to qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-from/tentacle.yaml index ddccab4b964..1014565c3c1 100644 --- 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/tentacle.yaml @@ -1,9 +1,9 @@ meta: - desc: | - install ceph/reef latest + install ceph/tentacle latest tasks: - install: - branch: reef + branch: tentacle exclude_packages: - librados3 - ceph-mgr-dashboard @@ -15,7 +15,7 @@ tasks: - ceph-osd-classic - ceph-osd-crimson extra_packages: ['librados2'] -- print: "**** done installing reef" +- print: "**** done installing tentacle" - ceph: log-ignorelist: - overall HEALTH_ @@ -37,5 +37,5 @@ tasks: ms bind msgr2: false - exec: osd.0: - - ceph osd set-require-min-compat-client reef + - ceph osd set-require-min-compat-client tentacle - print: "**** done ceph" diff --git a/qa/suites/fs/upgrade/nofs/tasks/0-from/reef.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/tentacle.yaml similarity index 83% rename from qa/suites/fs/upgrade/nofs/tasks/0-from/reef.yaml rename to qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/tentacle.yaml index ddccab4b964..1014565c3c1 100644 --- a/qa/suites/fs/upgrade/nofs/tasks/0-from/reef.yaml +++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/tentacle.yaml @@ -1,9 +1,9 @@ meta: - desc: | - install ceph/reef latest + install ceph/tentacle latest tasks: - install: - branch: reef + branch: tentacle exclude_packages: - librados3 - ceph-mgr-dashboard @@ -15,7 +15,7 @@ tasks: - ceph-osd-classic - ceph-osd-crimson extra_packages: ['librados2'] -- print: "**** done installing reef" +- print: "**** done installing tentacle" - ceph: log-ignorelist: - overall HEALTH_ @@ -37,5 +37,5 @@ tasks: ms bind msgr2: false - exec: osd.0: - - ceph osd set-require-min-compat-client reef + - ceph osd set-require-min-compat-client tentacle - print: "**** done ceph" diff --git a/qa/suites/fs/upgrade/nofs/tasks/0-from/tentacle.yaml b/qa/suites/fs/upgrade/nofs/tasks/0-from/tentacle.yaml new file mode 100644 index 00000000000..0be92c38da3 --- /dev/null +++ b/qa/suites/fs/upgrade/nofs/tasks/0-from/tentacle.yaml @@ -0,0 +1,39 @@ +meta: +- desc: | + install ceph/tentacle latest +tasks: +- install: + branch: tentacle + exclude_packages: + - librados3 + - ceph-mgr-dashboard + - ceph-mgr-diskprediction-local + - ceph-mgr-rook + - ceph-mgr-cephadm + - cephadm + - ceph-volume + extra_packages: ['librados2'] +- print: "**** done installing tentacle" +- ceph: + log-ignorelist: + - overall HEALTH_ + - \(FS_ + - \(MDS_ + - \(OSD_ + - \(MON_DOWN\) + - \(CACHE_POOL_ + - \(POOL_ + - \(MGR_DOWN\) + - \(PG_ + - \(SMALLER_PGP_NUM\) + - Monitor daemon marked osd + - Behind on trimming + - Manager daemon + conf: + global: + mon warn on pool no app: false + ms bind msgr2: false +- exec: + osd.0: + - ceph osd set-require-min-compat-client tentacle +- print: "**** done 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 deleted file mode 100644 index 00a2ba1ac87..00000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/0-install/reef.yaml +++ /dev/null @@ -1,55 +0,0 @@ -meta: -- desc: | - install ceph/reef latest -tasks: -- install: - branch: reef - exclude_packages: - - cephadm - - ceph-mgr-cephadm - - ceph-immutable-object-cache - - python3-rados - - python3-rgw - - python3-rbd - - python3-cephfs - - ceph-volume - - ceph-osd-classic - - ceph-osd-crimson - extra_packages: - - python-rados - - python-rgw - - python-rbd - - python-cephfs - # For kernel_untar_build workunit - extra_system_packages: - - bison - - flex - - elfutils-libelf-devel - - openssl-devel - - NetworkManager - - iproute - - util-linux -- print: "**** done installing reef" -- ceph: - log-ignorelist: - - overall HEALTH_ - - \(FS_ - - \(MDS_ - - \(OSD_ - - \(MON_DOWN\) - - \(CACHE_POOL_ - - \(POOL_ - - \(MGR_DOWN\) - - \(PG_ - - \(SMALLER_PGP_NUM\) - - Monitor daemon marked osd - - Behind on trimming - - Manager daemon - conf: - global: - mon warn on pool no app: false - ms bind msgr2: false -- exec: - osd.0: - - ceph osd set-require-min-compat-client reef -- print: "**** done 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 new file mode 100644 index 00000000000..8678c72514e --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/0-install/tentacle.yaml @@ -0,0 +1,40 @@ +meta: +- desc: | + install ceph/tentacle latest +tasks: +- install: + branch: tentacle + exclude_packages: + - librados3 + - ceph-mgr-dashboard + - ceph-mgr-diskprediction-local + - ceph-mgr-rook + - ceph-mgr-cephadm + - ceph-osd-crimson + - cephadm + - ceph-volume + extra_packages: ['librados2'] +- print: "**** done installing tentacle" +- ceph: + log-ignorelist: + - overall HEALTH_ + - \(FS_ + - \(MDS_ + - \(OSD_ + - \(MON_DOWN\) + - \(CACHE_POOL_ + - \(POOL_ + - \(MGR_DOWN\) + - \(PG_ + - \(SMALLER_PGP_NUM\) + - Monitor daemon marked osd + - Behind on trimming + - Manager daemon + conf: + global: + mon warn on pool no app: false + ms bind msgr2: false +- exec: + osd.0: + - ceph osd set-require-min-compat-client tentacle +- print: "**** done ceph" -- 2.47.3