qa/suites/orch/cephadm: replace "reef" with "v18.2.8"

Since Reef is EOL, the "reef" tag was removed from quay.ceph.io.
The solution is to replace the reef references with the "v18.2.8" tag.

I also added some yaml files to test the reef upgrade path, as those
were missing. These exist in tentacle.

Fixes: https://tracker.ceph.com/issues/76028
Signed-off-by: Laura Flores <lflores@ibm.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 (file)
index 0000000..e4e2381
--- /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.io/ceph/ceph:v18.2.8
+    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-reef.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04-reef.yaml
new file mode 100644 (file)
index 0000000..538ba11
--- /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.io/ceph/ceph:v18.2.8
+    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/workunits/cephadm/test_cephadm.sh b/qa/workunits/cephadm/test_cephadm.sh
index 6ea51bcc266ed76172594f7aec8c170439045130..a90f54bc9f204d66afdd19aff4cb7063d11544dc 100755 (executable)
--- a/qa/workunits/cephadm/test_cephadm.sh
+++ b/qa/workunits/cephadm/test_cephadm.sh
@@ -11,7 +11,7 @@ FSID='00000000-0000-0000-0000-0000deadbeef'
 # images that are used
 IMAGE_MAIN=${IMAGE_MAIN:-'quay.ceph.io/ceph-ci/ceph:main'}
 IMAGE_QUINCY=${IMAGE_QUINCY:-'quay.io/ceph/ceph:v17.2.8'}
-IMAGE_REEF=${IMAGE_REEF:-'quay.ceph.io/ceph-ci/ceph:reef'}
+IMAGE_REEF=${IMAGE_REEF:-'quay.io/ceph/ceph:v18.2.8'}
 IMAGE_SQUID=${IMAGE_SQUID:-'quay.ceph.io/ceph-ci/ceph:squid'}
 IMAGE_DEFAULT=${IMAGE_SQUID}