qa/suites/upgrade: allow upgrades to Rocky 10–based containers

Currently, the default OS used in our containers is CentOS Stream 9. We
want to test the upgrade path to images based on Rocky Linux 10.

This change is a temporary workaround for testing purposes. Rocky Linux
10 is expected to become the default base image, at which point
rockylinux-10 will no longer need to be explicitly included in the image
name. Therefore, we do not plan to merge this change.

Signed-off-by: Yaarit Hatuka <yhatuka@ibm.com>
(cherry picked from commit 49ebf82e8b6e186dca13be68c5e76aa4ff65adea)

diff --git a/qa/suites/upgrade/squid-x/parallel/upgrade-sequence.yaml b/qa/suites/upgrade/squid-x/parallel/upgrade-sequence.yaml
index 3aec52ce126437e552e46fe026cc70af149a31ff..db990b3ea5c741cf0402838826400a72373389c7 100644 (file)
--- a/qa/suites/upgrade/squid-x/parallel/upgrade-sequence.yaml
+++ b/qa/suites/upgrade/squid-x/parallel/upgrade-sequence.yaml
@@ -6,7 +6,7 @@ upgrade-sequence:
        env: [sha1]
        mon.a:
          - ceph config set global log_to_journald false --force
-         - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1
+         - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1-rockylinux-10
          - while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph orch upgrade status ; sleep 30 ; done
          - ceph orch ps
          - ceph versions

diff --git a/qa/suites/upgrade/squid-x/stress-split/1-start.yaml b/qa/suites/upgrade/squid-x/stress-split/1-start.yaml
index 29cd66ad02cd9efb79aa9910d38dc953bef12d7b..b5bb3f2076838dcbfbee524ea6f526ff9e0ae52f 100644 (file)
--- a/qa/suites/upgrade/squid-x/stress-split/1-start.yaml
+++ b/qa/suites/upgrade/squid-x/stress-split/1-start.yaml
@@ -87,30 +87,30 @@ first-half-sequence:
 
       - echo wait for mgr daemons to upgrade
       # upgrade the mgr daemons first
-      - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1 --daemon-types mgr
+      - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1-rockylinux-10 --daemon-types mgr
       - while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph orch upgrade status ; sleep 30 ; done
 
       - echo wait for minority of mons to upgrade
       # upgrade 1 of 3 mon daemons, then wait 60 seconds
-      - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1 --daemon-types mon --limit 1
+      - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1-rockylinux-10 --daemon-types mon --limit 1
       - while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph orch upgrade status ; sleep 30 ; done
       - sleep 60
 
       - echo wait for majority of mons to upgrade
       # upgrade one more mon daemon (to get us to 2/3 upgraded) and wait 60 seconds
-      - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1 --daemon-types mon --limit 1
+      - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1-rockylinux-10 --daemon-types mon --limit 1
       - while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph orch upgrade status ; sleep 30 ; done
       - sleep 60
 
       - echo wait for all mons to upgrade
       # upgrade final mon daemon and wait 60 seconds
-      - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1 --daemon-types mon
+      - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1-rockylinux-10 --daemon-types mon
       - while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph orch upgrade status ; sleep 30 ; done
       - sleep 60
 
       - echo wait for half of osds to upgrade
       # upgrade 4 of the 8 OSDs
-      - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1 --daemon-types osd --limit 4
+      - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1-rockylinux-10 --daemon-types osd --limit 4
       - while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph orch upgrade status ; sleep 30 ; done
 
 
@@ -140,7 +140,7 @@ second-half-sequence:
 
           - echo wait for upgrade to complete
           # upgrade whatever is left
-          - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1
+          - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1-rockylinux-10
           - while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph orch upgrade status ; sleep 30 ; done
 
           - echo upgrade complete

diff --git a/qa/suites/upgrade/telemetry-upgrade/squid-x/1-tasks.yaml b/qa/suites/upgrade/telemetry-upgrade/squid-x/1-tasks.yaml
index 0e56f4f8da970bc997e7ef5d205ffb41d7bc24c7..49f0dbbf27f99487ed30a82eebe7789ea5b82f4f 100644 (file)
--- a/qa/suites/upgrade/telemetry-upgrade/squid-x/1-tasks.yaml
+++ b/qa/suites/upgrade/telemetry-upgrade/squid-x/1-tasks.yaml
@@ -60,7 +60,7 @@ tasks:
         env: [sha1]
         mon.a:
             - ceph config set global log_to_journald false --force
-            - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1
+            - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1-rockylinux-10
             - while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph orch upgrade status ; sleep 30 ; done
             - ceph orch ps
             - ceph versions

diff --git a/qa/suites/upgrade/telemetry-upgrade/tentacle-x/1-tasks.yaml b/qa/suites/upgrade/telemetry-upgrade/tentacle-x/1-tasks.yaml
index 1e70f7f94d0deffcef5080ac07002ef1e2da9c30..93450c44dd90635fe2b917d018571eccd805d9f4 100644 (file)
--- a/qa/suites/upgrade/telemetry-upgrade/tentacle-x/1-tasks.yaml
+++ b/qa/suites/upgrade/telemetry-upgrade/tentacle-x/1-tasks.yaml
@@ -57,7 +57,7 @@ tasks:
         env: [sha1]
         mon.a:
             - ceph config set global log_to_journald false --force
-            - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1
+            - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1-rockylinux-10
             - while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph orch upgrade status ; sleep 30 ; done
             - ceph orch ps
             - ceph versions

diff --git a/qa/suites/upgrade/tentacle-x/parallel/upgrade-sequence.yaml b/qa/suites/upgrade/tentacle-x/parallel/upgrade-sequence.yaml
index 3aec52ce126437e552e46fe026cc70af149a31ff..db990b3ea5c741cf0402838826400a72373389c7 100644 (file)
--- a/qa/suites/upgrade/tentacle-x/parallel/upgrade-sequence.yaml
+++ b/qa/suites/upgrade/tentacle-x/parallel/upgrade-sequence.yaml
@@ -6,7 +6,7 @@ upgrade-sequence:
        env: [sha1]
        mon.a:
          - ceph config set global log_to_journald false --force
-         - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1
+         - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1-rockylinux-10
          - while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph orch upgrade status ; sleep 30 ; done
          - ceph orch ps
          - ceph versions

diff --git a/qa/suites/upgrade/tentacle-x/stress-split/1-start.yaml b/qa/suites/upgrade/tentacle-x/stress-split/1-start.yaml
index 3dd96f39f36c21fd9dd66d91cd03494f0193a329..9f8bcb6d0b7e52653383a783a8150eb2848d6271 100644 (file)
--- a/qa/suites/upgrade/tentacle-x/stress-split/1-start.yaml
+++ b/qa/suites/upgrade/tentacle-x/stress-split/1-start.yaml
@@ -90,30 +90,30 @@ first-half-sequence:
 
       - echo wait for mgr daemons to upgrade
       # upgrade the mgr daemons first
-      - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1 --daemon-types mgr
+      - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1-rockylinux-10 --daemon-types mgr
       - while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph orch upgrade status ; sleep 30 ; done
 
       - echo wait for minority of mons to upgrade
       # upgrade 1 of 3 mon daemons, then wait 60 seconds
-      - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1 --daemon-types mon --limit 1
+      - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1-rockylinux-10 --daemon-types mon --limit 1
       - while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph orch upgrade status ; sleep 30 ; done
       - sleep 60
 
       - echo wait for majority of mons to upgrade
       # upgrade one more mon daemon (to get us to 2/3 upgraded) and wait 60 seconds
-      - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1 --daemon-types mon --limit 1
+      - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1-rockylinux-10 --daemon-types mon --limit 1
       - while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph orch upgrade status ; sleep 30 ; done
       - sleep 60
 
       - echo wait for all mons to upgrade
       # upgrade final mon daemon and wait 60 seconds
-      - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1 --daemon-types mon
+      - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1-rockylinux-10 --daemon-types mon
       - while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph orch upgrade status ; sleep 30 ; done
       - sleep 60
 
       - echo wait for half of osds to upgrade
       # upgrade 4 of the 8 OSDs
-      - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1 --daemon-types osd --limit 4
+      - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1-rockylinux-10 --daemon-types osd --limit 4
       - while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph orch upgrade status ; sleep 30 ; done
 
 
@@ -143,7 +143,7 @@ second-half-sequence:
 
           - echo wait for upgrade to complete
           # upgrade whatever is left
-          - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1
+          - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1-rockylinux-10
           - while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph orch upgrade status ; sleep 30 ; done
 
           - echo upgrade complete