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/reef-x/parallel/upgrade-sequence.yaml b/qa/suites/upgrade/reef-x/parallel/upgrade-sequence.yaml
index 3aec52ce126437e552e46fe026cc70af149a31ff..db990b3ea5c741cf0402838826400a72373389c7 100644 (file)
--- a/qa/suites/upgrade/reef-x/parallel/upgrade-sequence.yaml
+++ b/qa/suites/upgrade/reef-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/reef-x/stress-split/1-start.yaml b/qa/suites/upgrade/reef-x/stress-split/1-start.yaml
index 6f34b45eed36af1930da039618b589ea771acd70..2baf17152e0127128c68e09f4d16d6c7bbdbe899 100644 (file)
--- a/qa/suites/upgrade/reef-x/stress-split/1-start.yaml
+++ b/qa/suites/upgrade/reef-x/stress-split/1-start.yaml
@@ -88,30 +88,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
 
 
@@ -141,7 +141,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/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/reef-x/1-tasks.yaml b/qa/suites/upgrade/telemetry-upgrade/reef-x/1-tasks.yaml
index ab63329b396d0999659d661e8d74afcf16304691..2f0a5ea9a385d5fe302aa5fb3a5b6d8aac290483 100644 (file)
--- a/qa/suites/upgrade/telemetry-upgrade/reef-x/1-tasks.yaml
+++ b/qa/suites/upgrade/telemetry-upgrade/reef-x/1-tasks.yaml
@@ -58,7 +58,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/squid-x/1-tasks.yaml b/qa/suites/upgrade/telemetry-upgrade/squid-x/1-tasks.yaml
index 6006f72365484c757fb49c86170e05d4bc5643ff..d1b39aee51dd9c6f3f4e87085c824635339113a8 100644 (file)
--- a/qa/suites/upgrade/telemetry-upgrade/squid-x/1-tasks.yaml
+++ b/qa/suites/upgrade/telemetry-upgrade/squid-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