From 1dccdd2fa182dcf666829a54bc6bc599a1f9da69 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 26 Jan 2021 10:19:53 -0600 Subject: [PATCH] qa/workunits/cepham/test_cephadm: pull only recent images, from quay.ceph.io No reason to pull nautilus/mimic, which don't even support cephadm. This test will mostly run in the sepia lab, so pull from there. Signed-off-by: Sage Weil --- qa/workunits/cephadm/test_cephadm.sh | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/qa/workunits/cephadm/test_cephadm.sh b/qa/workunits/cephadm/test_cephadm.sh index 999ba19bbdb7c..0650f9461efcc 100755 --- a/qa/workunits/cephadm/test_cephadm.sh +++ b/qa/workunits/cephadm/test_cephadm.sh @@ -9,10 +9,9 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" FSID='00000000-0000-0000-0000-0000deadbeef' # images that are used -IMAGE_MASTER=${IMAGE_MASTER:-'docker.io/ceph/daemon-base:latest-master-devel'} -IMAGE_OCTOPUS=${IMAGE_OCTOPUS:-'docker.io/ceph/daemon-base:latest-octopus'} -IMAGE_NAUTILUS=${IMAGE_NAUTILUS:-'docker.io/ceph/daemon-base:latest-nautilus'} -IMAGE_MIMIC=${IMAGE_MIMIC:-'docker.io/ceph/daemon-base:latest-mimic'} +IMAGE_MASTER=${IMAGE_MASTER:-'quay.ceph.io/ceph-ci/ceph:master'} +IMAGE_PACIFIC=${IMAGE_PACIFIC:-'quay.ceph.io/ceph-ci/ceph:pacific'} +IMAGE_OCTOPUS=${IMAGE_OCTOPUS:-'quay.ceph.io/ceph-ci/ceph:octopus'} OSD_IMAGE_NAME="${SCRIPT_NAME%.*}_osd.img" OSD_IMAGE_SIZE='6G' @@ -146,15 +145,12 @@ $SUDO $CEPHADM check-host $SUDO $CEPHADM gather-facts ## version + --image +$SUDO CEPHADM_IMAGE=$IMAGE_PACIFIC $CEPHADM_BIN version +$SUDO CEPHADM_IMAGE=$IMAGE_PACIFIC $CEPHADM_BIN version \ + | grep 'ceph version 16' $SUDO CEPHADM_IMAGE=$IMAGE_OCTOPUS $CEPHADM_BIN version $SUDO CEPHADM_IMAGE=$IMAGE_OCTOPUS $CEPHADM_BIN version \ | grep 'ceph version 15' -$SUDO CEPHADM_IMAGE=$IMAGE_NAUTILUS $CEPHADM_BIN version -$SUDO CEPHADM_IMAGE=$IMAGE_NAUTILUS $CEPHADM_BIN version \ - | grep 'ceph version 14' -$SUDO $CEPHADM_BIN --image $IMAGE_MIMIC version -$SUDO $CEPHADM_BIN --image $IMAGE_MIMIC version \ - | grep 'ceph version 13' $SUDO $CEPHADM_BIN --image $IMAGE_MASTER version | grep 'ceph version' # try force docker; this won't work if docker isn't installed -- 2.39.5