RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 03:27:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #32375 into master

Browse Source 
* refs/pull/32375/head:
	qa/tasks/cephadm: ceph.git branches are now pushed to quay.io

Reviewed-by: Michael Fritch <mfritch@suse.com>
This commit is contained in:
Sage Weil 2019-12-20 14:57:00 -06:00
commit 7e19a507f9
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qa/tasks/cephadm.py
View File

@ -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