qa/tasks/cephadm: allow custom git_url for cephadm_branch pull

Normally the git_url is git://git.ceph.com/ceph-ci.git, which mirrors
upstream ceph-ci.git.  However, the release branches aren't present there.
Allow a custom git_url so we can pull these from the main ceph.git.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 5842058d128d48495285242b46e41eba18916084)

# Conflicts:
#	qa/suites/upgrade/pacific-x/parallel/1-tasks.yaml

diff --git a/qa/suites/rados/cephadm/upgrade/1-start.yaml b/qa/suites/rados/cephadm/upgrade/1-start.yaml
index 4016c951d7745c5f49bb80b009150acfc0dce2d7..f2b44bbb9caabad2c9b6dcba0f5fdc0c338d8bdc 100644 (file)
--- a/qa/suites/rados/cephadm/upgrade/1-start.yaml
+++ b/qa/suites/rados/cephadm/upgrade/1-start.yaml
@@ -2,5 +2,6 @@ tasks:
 - cephadm:
     image: docker.io/ceph/ceph:v15.2.0
     cephadm_branch: v15.2.0
+    cephadm_git_url: https://github.com/ceph/ceph
     # avoid --cap-add=PTRACE + --privileged for older cephadm versions
     allow_ptrace: false

diff --git a/qa/suites/upgrade/octopus-x/parallel/1-tasks.yaml b/qa/suites/upgrade/octopus-x/parallel/1-tasks.yaml
index c6b7b0894e8e0c488ab1c0806df56dd2a7a052b4..d5da286675dadde37006bc7de5c4c215f932a368 100644 (file)
--- a/qa/suites/upgrade/octopus-x/parallel/1-tasks.yaml
+++ b/qa/suites/upgrade/octopus-x/parallel/1-tasks.yaml
@@ -6,6 +6,7 @@ tasks:
 - cephadm:
     image: docker.io/ceph/daemon-base:latest-octopus
     cephadm_branch: octopus
+    cephadm_git_url: https://github.com/ceph/ceph
     conf:
       osd:
         #set config option for which cls modules are allowed to be loaded / used

diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index 08d177b2ac1e6fbb6dba1892f73ba0faac27f556..22b4ed8e913c7efb45013d12bc5639d4ab5f9b15 100644 (file)
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -99,7 +99,7 @@ def download_cephadm(ctx, config, ref):
 
     if config.get('cephadm_mode') != 'cephadm-package':
         ref = config.get('cephadm_branch', ref)
-        git_url = teuth_config.get_ceph_git_url()
+        git_url = config.get('cephadm_git_url', teuth_config.get_ceph_git_url())
         log.info('Downloading cephadm (repo %s ref %s)...' % (git_url, ref))
         if git_url.startswith('https://github.com/'):
             # git archive doesn't like https:// URLs, which we use with github.