From: Laura Flores Date: Thu, 29 Jan 2026 22:09:25 +0000 (-0600) Subject: qa/suites/upgrade: update upgrade paths X-Git-Tag: v20.2.2~56^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aff7dee0313e8f462f704ad69b4bab0d5742febb;p=ceph.git qa/suites/upgrade: update upgrade paths Reef is EOL, so it should be removed from the upgrade paths. Upgrade paths only go as far back as two releases, and since the last two releases are Tentacle and Squid, Reef is outside of this "N-2" schema. Since Squid and Tentacle are the latest stable releases if we look back from "main", then we need to make sure to add Tentacle to the upgrade paths. This modification is prompted by the fact that we can't test upgrade paths from Reef to Main on Rocky10 packages. But this change should happen regardless. Fixes: https://tracker.ceph.com/issues/74609 Signed-off-by: Laura Flores (cherry picked from commit 0d6a39d0b2c08b66771822371ee53b1f94bdbd28) Conflicts: qa/suites/upgrade/reef-x/parallel/overrides/ignorelist_health.yaml qa/suites/upgrade/telemetry-upgrade/tentacle-x/1-tasks.yaml qa/suites/upgrade/tentacle-x/parallel/0-start.yaml qa/suites/upgrade/tentacle-x/parallel/1-tasks.yaml qa/suites/upgrade/tentacle-x/stress-split/1-start.yaml This is only a partial backport of 0d6a39d. We do not need the full changes (i.e. replacing the Reef upgrade path with Tentacle) since we still want the Reef upgrade path for Tentacle. --- diff --git a/qa/workunits/test_telemetry_squid.sh b/qa/workunits/test_telemetry_squid.sh index 332ed1c047c..c8da926651c 100755 --- a/qa/workunits/test_telemetry_squid.sh +++ b/qa/workunits/test_telemetry_squid.sh @@ -30,7 +30,7 @@ ceph -s REPORTED_COLLECTIONS=$(ceph telemetry collection ls) NUM_REPORTED_COLLECTIONS=$(echo "$REPORTED_COLLECTIONS" | awk '/^NAME/ {flag=1; next} flag' | wc -l) KNOWN_COLLECTIONS=("basic_base" "basic_mds_metadata" "basic_pool_flags" "basic_pool_options_bluestore" - "basic_pool_usage" "basic_rook_v01" "basic_usage_by_class" "crash_base" + "basic_pool_usage" "basic_rook_v01" "basic_stretch_cluster" "basic_usage_by_class" "crash_base" "device_base" "ident_base" "perf_memory_metrics" "perf_perf") if ! [[ $NUM_REPORTED_COLLECTIONS == "${#KNOWN_COLLECTIONS[@]}" ]];