From: Adam King <adking@redhat.com>
Date: Mon, 1 Jul 2024 18:22:47 +0000 (-0400)
Subject: qa/cephadm: change upgrade test start point to reef/squid
X-Git-Tag: v20.0.0~1553^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cfb26d81eb94b63c107fc7bacf268bf226a1c091;p=ceph.git

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>
---

diff --git a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream-reef.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream-reef.yaml
new file mode 100644
index 000000000000..bd5cdc724c3e
--- /dev/null
+++ b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream-reef.yaml
@@ -0,0 +1,29 @@
+os_type: centos
+os_version: "9.stream"
+
+tasks:
+- cephadm:
+    image: quay.ceph.io/ceph-ci/ceph:reef
+    compiled_cephadm_branch: reef
+
+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-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 000000000000..f4b6cd3aa6e4
--- /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-centos_9.stream.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream.yaml
deleted file mode 100644
index 885efe6bf6f6..000000000000
--- a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-os_type: centos
-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
-
-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-reef.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04-reef.yaml
new file mode 100644
index 000000000000..c9931c260947
--- /dev/null
+++ b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04-reef.yaml
@@ -0,0 +1,29 @@
+os_type: ubuntu
+os_version: "22.04"
+
+tasks:
+- cephadm:
+    image: quay.ceph.io/ceph-ci/ceph:reef
+    compiled_cephadm_branch: reef
+
+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-squid.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04-squid.yaml
new file mode 100644
index 000000000000..cc5835e02350
--- /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
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.yaml
deleted file mode 100644
index 767cd2421941..000000000000
--- a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-os_type: ubuntu
-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
-
-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