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 911068fe5f4626bf0091e9397a890e911ab593d1..e0145c96ad9e9944816b5f335dc91d2fee2fd1dc 100644 (file)
--- 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