Merge pull request ceph#58382 from adk3798/cephadm-upgrade-test-start-points

qa/cephadm: change upgrade test start point to reef/squid

Reviewed-by: John Mulligan <[email protected]>

Author: adk3798

…tart-distro/1-start-centos_9.stream.yaml …distro/1-start-centos_9.stream-reef.yamlqa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream.yaml renamed to qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream-reef.yaml qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream.yaml renamed to 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

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

…1-start-distro/1-start-ubuntu_22.04.yaml …rt-distro/1-start-ubuntu_22.04-reef.yamlqa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04.yaml renamed to qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04-reef.yaml qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04.yaml renamed to 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

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