From 895a5e1427fe2e686a92df185811adf2da2678fb Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 20 Dec 2019 08:56:09 -0600 Subject: [PATCH] qa/tasks/cephadm: ceph.git branches are now pushed to quay.io Signed-off-by: Sage Weil --- qa/tasks/cephadm.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py index 911068fe5f4..e0145c96ad9 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 -- 2.39.5