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 6e3ede31c04c113e5423432476c5949b01bc6ad0..7f7ad8c57d3df5299a7498c27d82089ca726283a 100644 (file)
--- 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 b4a67744f3555e9f3f8bc98728e2ba3a0910b27b..1add459f439e1843276b9854d7a28c44eb43a154 100644 (file)
--- 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