diff options
author | Sebastian Wagner <sebastian.wagner@suse.com> | 2020-04-07 14:08:51 +0200 |
---|---|---|
committer | Sebastian Wagner <sebastian.wagner@suse.com> | 2020-04-14 16:05:14 +0200 |
commit | de448fafe0fe7d6889f3f75ac37f870cde00cf1c (patch) | |
tree | 23cb687b52953ed725ecaf33091cdd6cadab579e /qa | |
parent | Merge pull request #34336 from nSedrickm/nsedrickm-ceph-dev (diff) | |
download | ceph-de448fafe0fe7d6889f3f75ac37f870cde00cf1c.tar.xz ceph-de448fafe0fe7d6889f3f75ac37f870cde00cf1c.zip |
cephadm: Update images used
Print warning when using cephadm from master
See also "use quay octopus tip until 15.2 tag is available"
* a9b15c7e1a0c14376cd66f166370694294398494.
See also "update default container images"
* 1f05f7578794380f969a7e93db07345626b3e4df.
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Diffstat (limited to 'qa')
-rwxr-xr-x | qa/workunits/cephadm/test_cephadm.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qa/workunits/cephadm/test_cephadm.sh b/qa/workunits/cephadm/test_cephadm.sh index ac9c922a97c..98d015bd4e2 100755 --- a/qa/workunits/cephadm/test_cephadm.sh +++ b/qa/workunits/cephadm/test_cephadm.sh @@ -6,7 +6,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" FSID='00000000-0000-0000-0000-0000deadbeef' # images that are used -IMAGE_MASTER=${IMAGE_MASTER:-'quay.io/ceph-ci/ceph:octopus'} # octopus for octopus branch +IMAGE_MASTER=${IMAGE_MASTER:-'docker.io/ceph/daemon-base:latest-master-devel'} IMAGE_NAUTILUS=${IMAGE_NAUTILUS:-'docker.io/ceph/daemon-base:latest-nautilus'} IMAGE_MIMIC=${IMAGE_MIMIC:-'docker.io/ceph/daemon-base:latest-mimic'} |