tentacle: suites/upgrade add centos to centos image upgrade

Previously, each suite had a single upgrade-sequence.yaml that targeted
only one image.
This commit splits each upgrade sequence into two variants teuthology
picks one per run

  upgrade-sequence$/centos-stream9.yaml  - targets $sha1
  upgrade-sequence$/rockylinux-10.yaml   - targets $sha1-rockylinux-10

This applies to:
 - reef-x/parallel
 - reef-x/stress-split
 - squid-x/parallel
 - squid-x/stress-split
 - telemetry/reef-x
 - telemetry/squid-x

For the stress-split suites, the upgrade logic is split into a
first-half-sequence run concurrently with thrashosds,
and a second-half-sequence run after.
Both sequences contain the hardcoded target image, so each variant
needs its own copy. They were previously inlined in 1-start.yaml.

This commit extracts them into the upgrade-sequence$/ files so
each variant can target the right image.

Fixes: https://tracker.ceph.com/issues/76710
Signed-off-by: Nitzan Mordechai <nmordech@ibm.com>

diff --git a/qa/suites/upgrade/reef-x/parallel/upgrade-sequence$/.qa b/qa/suites/upgrade/reef-x/parallel/upgrade-sequence$/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/upgrade/reef-x/parallel/upgrade-sequence$/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/upgrade/reef-x/parallel/upgrade-sequence$/centos-stream9-image.yaml b/qa/suites/upgrade/reef-x/parallel/upgrade-sequence$/centos-stream9-image.yaml
new file mode 100644 (file)
index 0000000..894bade
--- /dev/null
+++ b/qa/suites/upgrade/reef-x/parallel/upgrade-sequence$/centos-stream9-image.yaml
@@ -0,0 +1,16 @@
+
+upgrade-sequence:
+   sequential:
+   - print: "**** done start upgrade, wait"
+   - cephadm.shell:
+       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
+         - 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
+         - ceph versions | jq -e '.overall | length == 1'
+         - ceph versions | jq -e '.overall | keys' | grep $sha1
+   - print: "**** done end upgrade, wait..."
+

diff --git a/qa/suites/upgrade/reef-x/parallel/upgrade-sequence$/rockylinux-10-image.yaml b/qa/suites/upgrade/reef-x/parallel/upgrade-sequence$/rockylinux-10-image.yaml
new file mode 100644 (file)
index 0000000..77b1514
--- /dev/null
+++ b/qa/suites/upgrade/reef-x/parallel/upgrade-sequence$/rockylinux-10-image.yaml
@@ -0,0 +1,16 @@
+
+upgrade-sequence:
+   sequential:
+   - print: "**** done start upgrade, wait"
+   - cephadm.shell:
+       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-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
+         - ceph versions | jq -e '.overall | length == 1'
+         - ceph versions | jq -e '.overall | keys' | grep $sha1
+   - print: "**** done end upgrade, wait..."
+

diff --git a/qa/suites/upgrade/reef-x/parallel/upgrade-sequence.yaml b/qa/suites/upgrade/reef-x/parallel/upgrade-sequence.yaml
deleted file mode 100644 (file)
index db990b3..0000000
--- a/qa/suites/upgrade/reef-x/parallel/upgrade-sequence.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-# renamed tasks: to upgrade-sequence:
-upgrade-sequence:
-   sequential:
-   - print: "**** done start upgrade, wait"
-   - cephadm.shell:
-       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-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
-         - ceph versions | jq -e '.overall | length == 1'
-         - ceph versions | jq -e '.overall | keys' | grep $sha1
-   - print: "**** done end upgrade, wait..."
-

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 2baf17152e0127128c68e09f4d16d6c7bbdbe899..ace8cb2ba0cf3e0eeb9d17637dfebadc86e6e7d9 100644 (file)
--- a/qa/suites/upgrade/reef-x/stress-split/1-start.yaml
+++ b/qa/suites/upgrade/reef-x/stress-split/1-start.yaml
@@ -77,44 +77,6 @@ tasks:
 - ceph.healthy:
 
 
-#################
-
-first-half-sequence:
-- cephadm.shell:
-    env: [sha1]
-    mon.a:
-      - ceph config set mgr mgr/cephadm/daemon_cache_timeout 60
-      - ceph config set global log_to_journald false --force
-
-      - echo wait for mgr daemons to upgrade
-      # upgrade the mgr daemons first
-      - 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-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-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-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-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
-
-
 #################
 
 stress-tasks:
@@ -128,24 +90,3 @@ stress-tasks:
     disable_objectstore_tool_tests: true
     chance_force_recovery: 0
     aggressive_pg_num_changes: false
-
-
-#################
-
-second-half-sequence:
-  sequential:
-    - cephadm.shell:
-        env: [sha1]
-        mon.a:
-          - sleep 60
-
-          - echo wait for upgrade to complete
-          # upgrade whatever is left
-          - 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
-          - ceph orch ps
-          - ceph versions
-          - ceph versions | jq -e '.overall | length == 1'
-          - ceph versions | jq -e '.overall | keys' | grep $sha1

diff --git a/qa/suites/upgrade/reef-x/stress-split/upgrade-sequence$/.qa b/qa/suites/upgrade/reef-x/stress-split/upgrade-sequence$/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/upgrade/reef-x/stress-split/upgrade-sequence$/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/upgrade/reef-x/stress-split/upgrade-sequence$/centos-stream9-image.yaml b/qa/suites/upgrade/reef-x/stress-split/upgrade-sequence$/centos-stream9-image.yaml
new file mode 100644 (file)
index 0000000..d9a05b1
--- /dev/null
+++ b/qa/suites/upgrade/reef-x/stress-split/upgrade-sequence$/centos-stream9-image.yaml
@@ -0,0 +1,55 @@
+
+first-half-sequence:
+- cephadm.shell:
+    env: [sha1]
+    mon.a:
+      - ceph config set mgr mgr/cephadm/daemon_cache_timeout 60
+      - ceph config set global log_to_journald false --force
+
+      - 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
+      - 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
+      - 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
+      - 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
+      - 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
+      - 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
+
+
+
+second-half-sequence:
+  sequential:
+    - cephadm.shell:
+        env: [sha1]
+        mon.a:
+          - sleep 60
+
+          - echo wait for upgrade to complete
+          # upgrade whatever is left
+          - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1
+          - 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
+          - ceph orch ps
+          - ceph versions
+          - ceph versions | jq -e '.overall | length == 1'
+          - ceph versions | jq -e '.overall | keys' | grep $sha1

diff --git a/qa/suites/upgrade/reef-x/stress-split/upgrade-sequence$/rockylinux-10-image.yaml b/qa/suites/upgrade/reef-x/stress-split/upgrade-sequence$/rockylinux-10-image.yaml
new file mode 100644 (file)
index 0000000..0abc5a9
--- /dev/null
+++ b/qa/suites/upgrade/reef-x/stress-split/upgrade-sequence$/rockylinux-10-image.yaml
@@ -0,0 +1,55 @@
+
+first-half-sequence:
+- cephadm.shell:
+    env: [sha1]
+    mon.a:
+      - ceph config set mgr mgr/cephadm/daemon_cache_timeout 60
+      - ceph config set global log_to_journald false --force
+
+      - echo wait for mgr daemons to upgrade
+      # upgrade the mgr daemons first
+      - 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-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-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-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-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
+
+
+
+second-half-sequence:
+  sequential:
+    - cephadm.shell:
+        env: [sha1]
+        mon.a:
+          - sleep 60
+
+          - echo wait for upgrade to complete
+          # upgrade whatever is left
+          - 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
+          - ceph orch ps
+          - ceph versions
+          - ceph versions | jq -e '.overall | length == 1'
+          - ceph versions | jq -e '.overall | keys' | grep $sha1

diff --git a/qa/suites/upgrade/squid-x/parallel/upgrade-sequence$/.qa b/qa/suites/upgrade/squid-x/parallel/upgrade-sequence$/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/upgrade/squid-x/parallel/upgrade-sequence$/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/upgrade/squid-x/parallel/upgrade-sequence$/centos-stream9-image.yaml b/qa/suites/upgrade/squid-x/parallel/upgrade-sequence$/centos-stream9-image.yaml
new file mode 100644 (file)
index 0000000..894bade
--- /dev/null
+++ b/qa/suites/upgrade/squid-x/parallel/upgrade-sequence$/centos-stream9-image.yaml
@@ -0,0 +1,16 @@
+
+upgrade-sequence:
+   sequential:
+   - print: "**** done start upgrade, wait"
+   - cephadm.shell:
+       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
+         - 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
+         - ceph versions | jq -e '.overall | length == 1'
+         - ceph versions | jq -e '.overall | keys' | grep $sha1
+   - print: "**** done end upgrade, wait..."
+

diff --git a/qa/suites/upgrade/squid-x/parallel/upgrade-sequence$/rockylinux-10-image.yaml b/qa/suites/upgrade/squid-x/parallel/upgrade-sequence$/rockylinux-10-image.yaml
new file mode 100644 (file)
index 0000000..77b1514
--- /dev/null
+++ b/qa/suites/upgrade/squid-x/parallel/upgrade-sequence$/rockylinux-10-image.yaml
@@ -0,0 +1,16 @@
+
+upgrade-sequence:
+   sequential:
+   - print: "**** done start upgrade, wait"
+   - cephadm.shell:
+       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-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
+         - ceph versions | jq -e '.overall | length == 1'
+         - ceph versions | jq -e '.overall | keys' | grep $sha1
+   - print: "**** done end upgrade, wait..."
+

diff --git a/qa/suites/upgrade/squid-x/parallel/upgrade-sequence.yaml b/qa/suites/upgrade/squid-x/parallel/upgrade-sequence.yaml
deleted file mode 100644 (file)
index db990b3..0000000
--- a/qa/suites/upgrade/squid-x/parallel/upgrade-sequence.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-# renamed tasks: to upgrade-sequence:
-upgrade-sequence:
-   sequential:
-   - print: "**** done start upgrade, wait"
-   - cephadm.shell:
-       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-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
-         - ceph versions | jq -e '.overall | length == 1'
-         - ceph versions | jq -e '.overall | keys' | grep $sha1
-   - print: "**** done end upgrade, wait..."
-

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 b5bb3f2076838dcbfbee524ea6f526ff9e0ae52f..75b817c37790e5d1a76d3392cc8f3a92f96a5703 100644 (file)
--- a/qa/suites/upgrade/squid-x/stress-split/1-start.yaml
+++ b/qa/suites/upgrade/squid-x/stress-split/1-start.yaml
@@ -78,43 +78,6 @@ tasks:
 
 #################
 
-first-half-sequence:
-- cephadm.shell:
-    env: [sha1]
-    mon.a:
-      - ceph config set mgr mgr/cephadm/daemon_cache_timeout 60
-      - ceph config set global log_to_journald false --force
-
-      - echo wait for mgr daemons to upgrade
-      # upgrade the mgr daemons first
-      - 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-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-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-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-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
-
-
-#################
 
 stress-tasks:
 - thrashosds:
@@ -128,23 +91,3 @@ stress-tasks:
     chance_force_recovery: 0
     aggressive_pg_num_changes: false
 
-
-#################
-
-second-half-sequence:
-  sequential:
-    - cephadm.shell:
-        env: [sha1]
-        mon.a:
-          - sleep 60
-
-          - echo wait for upgrade to complete
-          # upgrade whatever is left
-          - 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
-          - ceph orch ps
-          - ceph versions
-          - ceph versions | jq -e '.overall | length == 1'
-          - ceph versions | jq -e '.overall | keys' | grep $sha1

diff --git a/qa/suites/upgrade/squid-x/stress-split/upgrade-sequence$/.qa b/qa/suites/upgrade/squid-x/stress-split/upgrade-sequence$/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/upgrade/squid-x/stress-split/upgrade-sequence$/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/upgrade/squid-x/stress-split/upgrade-sequence$/centos-stream9-image.yaml b/qa/suites/upgrade/squid-x/stress-split/upgrade-sequence$/centos-stream9-image.yaml
new file mode 100644 (file)
index 0000000..24b6594
--- /dev/null
+++ b/qa/suites/upgrade/squid-x/stress-split/upgrade-sequence$/centos-stream9-image.yaml
@@ -0,0 +1,58 @@
+
+first-half-sequence:
+- cephadm.shell:
+    env: [sha1]
+    mon.a:
+      - ceph config set mgr mgr/cephadm/daemon_cache_timeout 60
+      - ceph config set global log_to_journald false --force
+
+      - 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
+      - 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
+      - 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
+      - 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
+      - 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
+      - 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
+
+
+#################
+
+second-half-sequence:
+  sequential:
+    - cephadm.shell:
+        env: [sha1]
+        mon.a:
+          - sleep 60
+
+          - echo wait for upgrade to complete
+          # upgrade whatever is left
+          - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1
+          - 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
+          - ceph orch ps
+          - ceph versions
+          - ceph versions | jq -e '.overall | length == 1'
+          - ceph versions | jq -e '.overall | keys' | grep $sha1
+
+

diff --git a/qa/suites/upgrade/squid-x/stress-split/upgrade-sequence$/rockylinux-10-image.yaml b/qa/suites/upgrade/squid-x/stress-split/upgrade-sequence$/rockylinux-10-image.yaml
new file mode 100644 (file)
index 0000000..966ac1b
--- /dev/null
+++ b/qa/suites/upgrade/squid-x/stress-split/upgrade-sequence$/rockylinux-10-image.yaml
@@ -0,0 +1,58 @@
+
+first-half-sequence:
+- cephadm.shell:
+    env: [sha1]
+    mon.a:
+      - ceph config set mgr mgr/cephadm/daemon_cache_timeout 60
+      - ceph config set global log_to_journald false --force
+
+      - echo wait for mgr daemons to upgrade
+      # upgrade the mgr daemons first
+      - 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-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-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-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-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
+
+
+#################
+
+second-half-sequence:
+  sequential:
+    - cephadm.shell:
+        env: [sha1]
+        mon.a:
+          - sleep 60
+
+          - echo wait for upgrade to complete
+          # upgrade whatever is left
+          - 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
+          - ceph orch ps
+          - ceph versions
+          - ceph versions | jq -e '.overall | length == 1'
+          - ceph versions | jq -e '.overall | keys' | grep $sha1
+
+

diff --git a/qa/suites/upgrade/telemetry-upgrade/reef-x/1-tasks$/.qa b/qa/suites/upgrade/telemetry-upgrade/reef-x/1-tasks$/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/upgrade/telemetry-upgrade/reef-x/1-tasks$/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/upgrade/telemetry-upgrade/reef-x/1-tasks$/centos-stream9.yaml b/qa/suites/upgrade/telemetry-upgrade/reef-x/1-tasks$/centos-stream9.yaml
new file mode 100644 (file)
index 0000000..ab63329
--- /dev/null
+++ b/qa/suites/upgrade/telemetry-upgrade/reef-x/1-tasks$/centos-stream9.yaml
@@ -0,0 +1,81 @@
+overrides:
+  ceph:
+    log-ignorelist:
+      - mons down
+      - mon down
+      - MON_DOWN
+      - out of quorum
+      - PG_
+      - OSD_DOWN
+      - POOL_APP_NOT_ENABLED
+      - pgs degraded
+      - pg degraded
+      - object degraded
+      - objects degraded
+      - FS_DEGRADED
+      - MDS_ALL_DOWN
+      - OSD_UPGRADE_FINISHED
+      - do not have an application enabled
+      - is down
+      - TELEMETRY_CHANGED
+      - pg .*? is .*?degraded.*?, acting
+      - pg .* is stuck peering
+      - Telemetry requires re-opt-in
+tasks:
+- install:
+    branch: reef
+    exclude_packages:
+      - ceph-volume
+- print: "**** done install task..."
+- print: "**** done start installing reef cephadm ..."
+- cephadm:
+    image: quay.io/ceph/ceph:v18.2.8
+    compiled_cephadm_branch: reef
+    conf:
+      osd:
+        #set config option for which cls modules are allowed to be loaded / used
+        osd_class_load_list: "*"
+        osd_class_default_list: "*"
+- print: "**** done end installing reef cephadm ..."
+
+- print: "**** done start cephadm.shell ceph config set mgr..."
+- cephadm.shell:
+    mon.a:
+      - ceph config set mgr mgr/cephadm/use_repo_digest true --force
+- print: "**** done cephadm.shell ceph config set mgr..."
+
+- print: "**** done start telemetry reef..."
+- workunit:
+    clients:
+      client.0:
+        - test_telemetry_reef.sh
+- print: "**** done end telemetry reef..."
+
+- print: "**** done start upgrade sequence..."
+- sequential:
+    - print: "**** done start upgrade..."
+    - cephadm.shell:
+        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
+            - 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
+            - ceph versions | jq -e '.overall | length == 1'
+            - ceph versions | jq -e '.overall | keys' | grep $sha1
+    - print: "**** done end upgrade..."
+
+    - print: "**** done set require-osd-release ..."
+    - cephadm.shell:
+        env: [sha1]
+        mon.a:
+            - ceph osd require-osd-release tentacle
+
+    - print: "**** done start telemetry x..."
+    - workunit:
+        clients:
+          client.0:
+            - test_telemetry_reef_x.sh
+    - print: "**** done end telemetry x..."
+- print: "**** done end upgrade sequence..."

diff --git a/qa/suites/upgrade/telemetry-upgrade/reef-x/1-tasks$/rockylinux-10.yaml b/qa/suites/upgrade/telemetry-upgrade/reef-x/1-tasks$/rockylinux-10.yaml
new file mode 100644 (file)
index 0000000..2f0a5ea
--- /dev/null
+++ b/qa/suites/upgrade/telemetry-upgrade/reef-x/1-tasks$/rockylinux-10.yaml
@@ -0,0 +1,81 @@
+overrides:
+  ceph:
+    log-ignorelist:
+      - mons down
+      - mon down
+      - MON_DOWN
+      - out of quorum
+      - PG_
+      - OSD_DOWN
+      - POOL_APP_NOT_ENABLED
+      - pgs degraded
+      - pg degraded
+      - object degraded
+      - objects degraded
+      - FS_DEGRADED
+      - MDS_ALL_DOWN
+      - OSD_UPGRADE_FINISHED
+      - do not have an application enabled
+      - is down
+      - TELEMETRY_CHANGED
+      - pg .*? is .*?degraded.*?, acting
+      - pg .* is stuck peering
+      - Telemetry requires re-opt-in
+tasks:
+- install:
+    branch: reef
+    exclude_packages:
+      - ceph-volume
+- print: "**** done install task..."
+- print: "**** done start installing reef cephadm ..."
+- cephadm:
+    image: quay.io/ceph/ceph:v18.2.8
+    compiled_cephadm_branch: reef
+    conf:
+      osd:
+        #set config option for which cls modules are allowed to be loaded / used
+        osd_class_load_list: "*"
+        osd_class_default_list: "*"
+- print: "**** done end installing reef cephadm ..."
+
+- print: "**** done start cephadm.shell ceph config set mgr..."
+- cephadm.shell:
+    mon.a:
+      - ceph config set mgr mgr/cephadm/use_repo_digest true --force
+- print: "**** done cephadm.shell ceph config set mgr..."
+
+- print: "**** done start telemetry reef..."
+- workunit:
+    clients:
+      client.0:
+        - test_telemetry_reef.sh
+- print: "**** done end telemetry reef..."
+
+- print: "**** done start upgrade sequence..."
+- sequential:
+    - print: "**** done start upgrade..."
+    - cephadm.shell:
+        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-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
+            - ceph versions | jq -e '.overall | length == 1'
+            - ceph versions | jq -e '.overall | keys' | grep $sha1
+    - print: "**** done end upgrade..."
+
+    - print: "**** done set require-osd-release ..."
+    - cephadm.shell:
+        env: [sha1]
+        mon.a:
+            - ceph osd require-osd-release tentacle
+
+    - print: "**** done start telemetry x..."
+    - workunit:
+        clients:
+          client.0:
+            - test_telemetry_reef_x.sh
+    - print: "**** done end telemetry x..."
+- print: "**** done end upgrade sequence..."

diff --git a/qa/suites/upgrade/telemetry-upgrade/reef-x/1-tasks.yaml b/qa/suites/upgrade/telemetry-upgrade/reef-x/1-tasks.yaml
deleted file mode 100644 (file)
index 2f0a5ea..0000000
--- a/qa/suites/upgrade/telemetry-upgrade/reef-x/1-tasks.yaml
+++ /dev/null
@@ -1,81 +0,0 @@
-overrides:
-  ceph:
-    log-ignorelist:
-      - mons down
-      - mon down
-      - MON_DOWN
-      - out of quorum
-      - PG_
-      - OSD_DOWN
-      - POOL_APP_NOT_ENABLED
-      - pgs degraded
-      - pg degraded
-      - object degraded
-      - objects degraded
-      - FS_DEGRADED
-      - MDS_ALL_DOWN
-      - OSD_UPGRADE_FINISHED
-      - do not have an application enabled
-      - is down
-      - TELEMETRY_CHANGED
-      - pg .*? is .*?degraded.*?, acting
-      - pg .* is stuck peering
-      - Telemetry requires re-opt-in
-tasks:
-- install:
-    branch: reef
-    exclude_packages:
-      - ceph-volume
-- print: "**** done install task..."
-- print: "**** done start installing reef cephadm ..."
-- cephadm:
-    image: quay.io/ceph/ceph:v18.2.8
-    compiled_cephadm_branch: reef
-    conf:
-      osd:
-        #set config option for which cls modules are allowed to be loaded / used
-        osd_class_load_list: "*"
-        osd_class_default_list: "*"
-- print: "**** done end installing reef cephadm ..."
-
-- print: "**** done start cephadm.shell ceph config set mgr..."
-- cephadm.shell:
-    mon.a:
-      - ceph config set mgr mgr/cephadm/use_repo_digest true --force
-- print: "**** done cephadm.shell ceph config set mgr..."
-
-- print: "**** done start telemetry reef..."
-- workunit:
-    clients:
-      client.0:
-        - test_telemetry_reef.sh
-- print: "**** done end telemetry reef..."
-
-- print: "**** done start upgrade sequence..."
-- sequential:
-    - print: "**** done start upgrade..."
-    - cephadm.shell:
-        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-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
-            - ceph versions | jq -e '.overall | length == 1'
-            - ceph versions | jq -e '.overall | keys' | grep $sha1
-    - print: "**** done end upgrade..."
-
-    - print: "**** done set require-osd-release ..."
-    - cephadm.shell:
-        env: [sha1]
-        mon.a:
-            - ceph osd require-osd-release tentacle
-
-    - print: "**** done start telemetry x..."
-    - workunit:
-        clients:
-          client.0:
-            - test_telemetry_reef_x.sh
-    - print: "**** done end telemetry x..."
-- print: "**** done end upgrade sequence..."

diff --git a/qa/suites/upgrade/telemetry-upgrade/squid-x/1-tasks$/.qa b/qa/suites/upgrade/telemetry-upgrade/squid-x/1-tasks$/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/upgrade/telemetry-upgrade/squid-x/1-tasks$/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/upgrade/telemetry-upgrade/squid-x/1-tasks$/centos-stream9.yaml b/qa/suites/upgrade/telemetry-upgrade/squid-x/1-tasks$/centos-stream9.yaml
new file mode 100644 (file)
index 0000000..6006f72
--- /dev/null
+++ b/qa/suites/upgrade/telemetry-upgrade/squid-x/1-tasks$/centos-stream9.yaml
@@ -0,0 +1,80 @@
+overrides:
+  ceph:
+    log-ignorelist:
+      - mons down
+      - mon down
+      - MON_DOWN
+      - out of quorum
+      - PG_
+      - OSD_DOWN
+      - POOL_APP_NOT_ENABLED
+      - pgs degraded
+      - pg degraded
+      - object degraded
+      - objects degraded
+      - FS_DEGRADED
+      - MDS_ALL_DOWN
+      - OSD_UPGRADE_FINISHED
+      - do not have an application enabled
+      - is down
+      - TELEMETRY_CHANGED
+      - pg .*? is .*?degraded.*?, acting
+      - pg .* is stuck peering
+tasks:
+- install:
+    branch: squid
+    exclude_packages:
+      - ceph-volume
+- print: "**** done install task..."
+- print: "**** done start installing squid cephadm ..."
+- cephadm:
+    image: quay.ceph.io/ceph-ci/ceph:squid
+    compiled_cephadm_branch: squid
+    conf:
+      osd:
+        #set config option for which cls modules are allowed to be loaded / used
+        osd_class_load_list: "*"
+        osd_class_default_list: "*"
+- print: "**** done end installing squid cephadm ..."
+
+- print: "**** done start cephadm.shell ceph config set mgr..."
+- cephadm.shell:
+    mon.a:
+      - ceph config set mgr mgr/cephadm/use_repo_digest true --force
+- print: "**** done cephadm.shell ceph config set mgr..."
+
+- print: "**** done start telemetry squid..."
+- workunit:
+    clients:
+      client.0:
+        - test_telemetry_squid.sh
+- print: "**** done end telemetry squid..."
+
+- print: "**** done start upgrade sequence..."
+- sequential:
+    - print: "**** done start upgrade..."
+    - cephadm.shell:
+        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
+            - 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
+            - ceph versions | jq -e '.overall | length == 1'
+            - ceph versions | jq -e '.overall | keys' | grep $sha1
+    - print: "**** done end upgrade..."
+
+    - print: "**** done set require-osd-release ..."
+    - cephadm.shell:
+        env: [sha1]
+        mon.a:
+            - ceph osd require-osd-release tentacle
+
+    - print: "**** done start telemetry x..."
+    - workunit:
+        clients:
+          client.0:
+            - test_telemetry_squid_x.sh
+    - print: "**** done end telemetry x..."
+- print: "**** done end upgrade sequence..."

diff --git a/qa/suites/upgrade/telemetry-upgrade/squid-x/1-tasks$/rockylinux-10.yaml b/qa/suites/upgrade/telemetry-upgrade/squid-x/1-tasks$/rockylinux-10.yaml
new file mode 100644 (file)
index 0000000..d1b39ae
--- /dev/null
+++ b/qa/suites/upgrade/telemetry-upgrade/squid-x/1-tasks$/rockylinux-10.yaml
@@ -0,0 +1,80 @@
+overrides:
+  ceph:
+    log-ignorelist:
+      - mons down
+      - mon down
+      - MON_DOWN
+      - out of quorum
+      - PG_
+      - OSD_DOWN
+      - POOL_APP_NOT_ENABLED
+      - pgs degraded
+      - pg degraded
+      - object degraded
+      - objects degraded
+      - FS_DEGRADED
+      - MDS_ALL_DOWN
+      - OSD_UPGRADE_FINISHED
+      - do not have an application enabled
+      - is down
+      - TELEMETRY_CHANGED
+      - pg .*? is .*?degraded.*?, acting
+      - pg .* is stuck peering
+tasks:
+- install:
+    branch: squid
+    exclude_packages:
+      - ceph-volume
+- print: "**** done install task..."
+- print: "**** done start installing squid cephadm ..."
+- cephadm:
+    image: quay.ceph.io/ceph-ci/ceph:squid
+    compiled_cephadm_branch: squid
+    conf:
+      osd:
+        #set config option for which cls modules are allowed to be loaded / used
+        osd_class_load_list: "*"
+        osd_class_default_list: "*"
+- print: "**** done end installing squid cephadm ..."
+
+- print: "**** done start cephadm.shell ceph config set mgr..."
+- cephadm.shell:
+    mon.a:
+      - ceph config set mgr mgr/cephadm/use_repo_digest true --force
+- print: "**** done cephadm.shell ceph config set mgr..."
+
+- print: "**** done start telemetry squid..."
+- workunit:
+    clients:
+      client.0:
+        - test_telemetry_squid.sh
+- print: "**** done end telemetry squid..."
+
+- print: "**** done start upgrade sequence..."
+- sequential:
+    - print: "**** done start upgrade..."
+    - cephadm.shell:
+        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-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
+            - ceph versions | jq -e '.overall | length == 1'
+            - ceph versions | jq -e '.overall | keys' | grep $sha1
+    - print: "**** done end upgrade..."
+
+    - print: "**** done set require-osd-release ..."
+    - cephadm.shell:
+        env: [sha1]
+        mon.a:
+            - ceph osd require-osd-release tentacle
+
+    - print: "**** done start telemetry x..."
+    - workunit:
+        clients:
+          client.0:
+            - test_telemetry_squid_x.sh
+    - print: "**** done end telemetry x..."
+- print: "**** done end upgrade sequence..."

diff --git a/qa/suites/upgrade/telemetry-upgrade/squid-x/1-tasks.yaml b/qa/suites/upgrade/telemetry-upgrade/squid-x/1-tasks.yaml
deleted file mode 100644 (file)
index d1b39ae..0000000
--- a/qa/suites/upgrade/telemetry-upgrade/squid-x/1-tasks.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-overrides:
-  ceph:
-    log-ignorelist:
-      - mons down
-      - mon down
-      - MON_DOWN
-      - out of quorum
-      - PG_
-      - OSD_DOWN
-      - POOL_APP_NOT_ENABLED
-      - pgs degraded
-      - pg degraded
-      - object degraded
-      - objects degraded
-      - FS_DEGRADED
-      - MDS_ALL_DOWN
-      - OSD_UPGRADE_FINISHED
-      - do not have an application enabled
-      - is down
-      - TELEMETRY_CHANGED
-      - pg .*? is .*?degraded.*?, acting
-      - pg .* is stuck peering
-tasks:
-- install:
-    branch: squid
-    exclude_packages:
-      - ceph-volume
-- print: "**** done install task..."
-- print: "**** done start installing squid cephadm ..."
-- cephadm:
-    image: quay.ceph.io/ceph-ci/ceph:squid
-    compiled_cephadm_branch: squid
-    conf:
-      osd:
-        #set config option for which cls modules are allowed to be loaded / used
-        osd_class_load_list: "*"
-        osd_class_default_list: "*"
-- print: "**** done end installing squid cephadm ..."
-
-- print: "**** done start cephadm.shell ceph config set mgr..."
-- cephadm.shell:
-    mon.a:
-      - ceph config set mgr mgr/cephadm/use_repo_digest true --force
-- print: "**** done cephadm.shell ceph config set mgr..."
-
-- print: "**** done start telemetry squid..."
-- workunit:
-    clients:
-      client.0:
-        - test_telemetry_squid.sh
-- print: "**** done end telemetry squid..."
-
-- print: "**** done start upgrade sequence..."
-- sequential:
-    - print: "**** done start upgrade..."
-    - cephadm.shell:
-        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-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
-            - ceph versions | jq -e '.overall | length == 1'
-            - ceph versions | jq -e '.overall | keys' | grep $sha1
-    - print: "**** done end upgrade..."
-
-    - print: "**** done set require-osd-release ..."
-    - cephadm.shell:
-        env: [sha1]
-        mon.a:
-            - ceph osd require-osd-release tentacle
-
-    - print: "**** done start telemetry x..."
-    - workunit:
-        clients:
-          client.0:
-            - test_telemetry_squid_x.sh
-    - print: "**** done end telemetry x..."
-- print: "**** done end upgrade sequence..."