From cfb26d81eb94b63c107fc7bacf268bf226a1c091 Mon Sep 17 00:00:00 2001
From: Adam King <adking@redhat.com>
Date: Mon, 1 Jul 2024 14:22:47 -0400
Subject: [PATCH] qa/cephadm: change upgrade test start point to reef/squid

Since main is now what will become the T release,
we only need to be testing upgrades from reef and
squid. Upgrades from quincy won't be valid once
we've branched off

Signed-off-by: Adam King <adking@redhat.com>
---
 ...yaml => 1-start-centos_9.stream-reef.yaml} |  5 ++--
 .../1-start-centos_9.stream-squid.yaml        | 29 +++++++++++++++++++
 ...04.yaml => 1-start-ubuntu_22.04-reef.yaml} |  5 ++--
 .../1-start-ubuntu_22.04-squid.yaml           | 29 +++++++++++++++++++
 4 files changed, 62 insertions(+), 6 deletions(-)
 rename qa/suites/orch/cephadm/upgrade/1-start-distro/{1-start-centos_9.stream.yaml => 1-start-centos_9.stream-reef.yaml} (73%)
 create mode 100644 qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream-squid.yaml
 rename qa/suites/orch/cephadm/upgrade/1-start-distro/{1-start-ubuntu_22.04.yaml => 1-start-ubuntu_22.04-reef.yaml} (72%)
 create mode 100644 qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04-squid.yaml

diff --git a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream-reef.yaml
similarity index 73%
rename from qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream.yaml
rename to qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream-reef.yaml
index 885efe6bf6f..bd5cdc724c3 100644
--- a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream.yaml
+++ b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream-reef.yaml
@@ -3,9 +3,8 @@ os_version: "9.stream"
 
 tasks:
 - cephadm:
-    image: quay.io/ceph/ceph:v17.2.0
-    cephadm_branch: v17.2.0
-    cephadm_git_url: https://github.com/ceph/ceph
+    image: quay.ceph.io/ceph-ci/ceph:reef
+    compiled_cephadm_branch: reef
 
 roles:
 - - mon.a
diff --git a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream-squid.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream-squid.yaml
new file mode 100644
index 00000000000..f4b6cd3aa6e
--- /dev/null
+++ b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream-squid.yaml
@@ -0,0 +1,29 @@
+os_type: centos
+os_version: "9.stream"
+
+tasks:
+- cephadm:
+    image: quay.ceph.io/ceph-ci/ceph:squid
+    compiled_cephadm_branch: squid
+
+roles:
+- - mon.a
+  - mon.c
+  - mgr.y
+  - osd.0
+  - osd.1
+  - osd.2
+  - osd.3
+  - client.0
+  - node-exporter.a
+  - alertmanager.a
+- - mon.b
+  - mgr.x
+  - osd.4
+  - osd.5
+  - osd.6
+  - osd.7
+  - client.1
+  - prometheus.a
+  - grafana.a
+  - node-exporter.b
diff --git a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04-reef.yaml
similarity index 72%
rename from qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04.yaml
rename to qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04-reef.yaml
index 767cd242194..c9931c26094 100644
--- a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04.yaml
+++ b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04-reef.yaml
@@ -3,9 +3,8 @@ os_version: "22.04"
 
 tasks:
 - cephadm:
-    image: quay.io/ceph/ceph:v17.2.0
-    cephadm_branch: v17.2.0
-    cephadm_git_url: https://github.com/ceph/ceph
+    image: quay.ceph.io/ceph-ci/ceph:reef
+    compiled_cephadm_branch: reef
 
 roles:
 - - mon.a
diff --git a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04-squid.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04-squid.yaml
new file mode 100644
index 00000000000..cc5835e0235
--- /dev/null
+++ b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04-squid.yaml
@@ -0,0 +1,29 @@
+os_type: ubuntu
+os_version: "22.04"
+
+tasks:
+- cephadm:
+    image: quay.ceph.io/ceph-ci/ceph:squid
+    compiled_cephadm_branch: squid
+
+roles:
+- - mon.a
+  - mon.c
+  - mgr.y
+  - osd.0
+  - osd.1
+  - osd.2
+  - osd.3
+  - client.0
+  - node-exporter.a
+  - alertmanager.a
+- - mon.b
+  - mgr.x
+  - osd.4
+  - osd.5
+  - osd.6
+  - osd.7
+  - client.1
+  - prometheus.a
+  - grafana.a
+  - node-exporter.b
-- 
2.39.5