From: Sage Weil <sage@redhat.com>
Date: Fri, 20 Dec 2019 14:56:09 +0000 (-0600)
Subject: qa/tasks/cephadm: ceph.git branches are now pushed to quay.io
X-Git-Tag: v15.1.0~413^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=895a5e1427fe2e686a92df185811adf2da2678fb;p=ceph.git

qa/tasks/cephadm: ceph.git branches are now pushed to quay.io

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index 911068fe5f46..e0145c96ad9e 100644
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -790,11 +790,7 @@ def task(ctx, config):
             # hmm, fall back to branch?
             branch = config.get('branch', 'master')
             ref = branch
-            # FIXME when ceph-ci builds all branches
-            if branch in ['master', 'nautilus']:
-                ctx.ceph[cluster_name].image = 'ceph/daemon-base:latest-%s-devel' % branch
-            else:
-                ctx.ceph[cluster_name].image = 'quay.io/ceph-ci/ceph:%s' % branch
+            ctx.ceph[cluster_name].image = 'quay.io/ceph-ci/ceph:%s' % branch
     log.info('Cluster image is %s' % ctx.ceph[cluster_name].image)
 
     # uuid