From: Laura Flores <lflores@ibm.com>
Date: Wed, 19 Jun 2024 21:57:45 +0000 (-0500)
Subject: qa/suites/upgrade/telemetry-upgrade/reef-x: update how cephadm is pulled and change... 
X-Git-Tag: v19.1.1~161^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=680d94e1ac67be04aec9ac3c7c858b52d77d990c;p=ceph.git

qa/suites/upgrade/telemetry-upgrade/reef-x: update how cephadm is pulled and change image reference

Update how cephadm is pulled:

`cephadm_git_url` and `cephadm_branch` are used in releases older than reef
to install cephadm. Both of these keys are needed to install it from the github
repo.

However, in reef and on, the compiled zipapp cephadm needs to be pulled differently
than the old single python script `cephadm` from earlier releases.

This commit is what I referenced for this change: https://github.com/ceph/ceph/commit/967716f2e6c8cd3f7d810a5f8e5e49448717e513

-------

Change image reference:

`quay.io/ceph/daemon-base:latest-reef` points to the latest reef tag (v18.2.2),
not the tip of reef, which is actually what we want to test.

Pulling the daemon-base:latest-reef image shows it is running v18.2.2:
```
lflores:ceph$ podman run --rm -it daemon-base:latest-reef
[root@d4d9a0eb04be /]# ceph -v
ceph version 18.2.2 (531c0d11a1c5d39fbfe6aa8a521f023abf3bf3e2) reef (stable)
```

It is important that we test the tip of reef in case there is a fix there that we
want to pick up.

I referenced this commit to make the change: https://github.com/ceph/ceph/commit/d0381ed7e68a6de7c9ff1e4220698ed8eab28ac6

Signed-off-by: Laura Flores <lflores@ibm.com>
(cherry picked from commit fcb22a022038ce64dcc6e95f9be56cf75a3be4b0)
---

diff --git a/qa/suites/upgrade/telemetry-upgrade/reef-x/1-tasks.yaml b/qa/suites/upgrade/telemetry-upgrade/reef-x/1-tasks.yaml
index 070214e4e775..a6412f229c4d 100644
--- a/qa/suites/upgrade/telemetry-upgrade/reef-x/1-tasks.yaml
+++ b/qa/suites/upgrade/telemetry-upgrade/reef-x/1-tasks.yaml
@@ -25,9 +25,8 @@ tasks:
 - print: "**** done install task..."
 - print: "**** done start installing reef cephadm ..."
 - cephadm:
-    image: quay.io/ceph/daemon-base:latest-reef
-    cephadm_branch: reef
-    cephadm_git_url: https://github.com/ceph/ceph
+    image: quay.ceph.io/ceph-ci/ceph:reef
+    compiled_cephadm_branch: reef
     conf:
       osd:
         #set config option for which cls modules are allowed to be loaded / used