qa/cephadm: start upgrade tests from tentacle instead of reef on main

Since main is what will become umbrella at this point

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit a137bccbf4330a88f17588d465218165ec03b009)

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
deleted file mode 100644 (file)
index bd5cdc7..0000000
--- a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream-reef.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-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-tentacle.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream-tentacle.yaml
new file mode 100644 (file)
index 0000000..6fa765c
--- /dev/null
+++ b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream-tentacle.yaml
@@ -0,0 +1,29 @@
+os_type: centos
+os_version: "9.stream"
+
+tasks:
+- cephadm:
+    image: quay.ceph.io/ceph-ci/ceph:tentacle
+    compiled_cephadm_branch: tentacle
+
+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
deleted file mode 100644 (file)
index c9931c2..0000000
--- a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04-reef.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-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-tentacle.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04-tentacle.yaml
new file mode 100644 (file)
index 0000000..e2fbf8f
--- /dev/null
+++ b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04-tentacle.yaml
@@ -0,0 +1,29 @@
+os_type: ubuntu
+os_version: "22.04"
+
+tasks:
+- cephadm:
+    image: quay.ceph.io/ceph-ci/ceph:tentacle
+    compiled_cephadm_branch: tentacle
+
+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