From: Adam King <adking@redhat.com>
Date: Wed, 29 Nov 2023 16:49:38 +0000 (-0500)
Subject: qa/upgrade/reef-x: pull compiled cephadm to start upgrades from reef
X-Git-Tag: testing/wip-batrick-testing-20240411.154038~668^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=967716f2e6c8cd3f7d810a5f8e5e49448717e513;p=ceph-ci.git

qa/upgrade/reef-x: pull compiled cephadm to start upgrades from reef

The compiled zipapp cephadm that began in reef needs
to be pulled differently than the old single python script
cephadm from earlier releases. This commit updates the reef-x
upgrade suite to pull cephadm in this new way.

Signed-off-by: Adam King <adking@redhat.com>
---

diff --git a/qa/suites/upgrade/reef-x/parallel/1-tasks.yaml b/qa/suites/upgrade/reef-x/parallel/1-tasks.yaml
index 6e3ede31c04..7f7ad8c57d3 100644
--- a/qa/suites/upgrade/reef-x/parallel/1-tasks.yaml
+++ b/qa/suites/upgrade/reef-x/parallel/1-tasks.yaml
@@ -7,8 +7,7 @@ tasks:
 - print: "**** done start installing reef cephadm ..."
 - cephadm:
     image: quay.ceph.io/ceph-ci/ceph:reef
-    cephadm_branch: reef
-    cephadm_git_url: https://github.com/ceph/ceph
+    compiled_cephadm_branch: reef
     conf:
       osd:
         #set config option for which cls modules are allowed to be loaded / used
diff --git a/qa/suites/upgrade/reef-x/stress-split/1-start.yaml b/qa/suites/upgrade/reef-x/stress-split/1-start.yaml
index b4a67744f35..1add459f439 100644
--- a/qa/suites/upgrade/reef-x/stress-split/1-start.yaml
+++ b/qa/suites/upgrade/reef-x/stress-split/1-start.yaml
@@ -6,8 +6,7 @@ tasks:
 
 - cephadm:
     image: quay.ceph.io/ceph-ci/ceph:reef
-    cephadm_branch: reef
-    cephadm_git_url: https://github.com/ceph/ceph
+    compiled_cephadm_branch: reef
     conf:
       osd:
         #set config option for which cls modules are allowed to be loaded / used