From bf9cd06c6bbe3a1936ad300e50e5a25c95a1f247 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Wed, 22 Apr 2020 15:31:19 +0200 Subject: [PATCH] qa/workunits/cephadm/test_cephadm: Also test octopus Signed-off-by: Sebastian Wagner --- qa/workunits/cephadm/test_cephadm.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qa/workunits/cephadm/test_cephadm.sh b/qa/workunits/cephadm/test_cephadm.sh index dd03453c6dc7..fca69e1aa6b0 100755 --- a/qa/workunits/cephadm/test_cephadm.sh +++ b/qa/workunits/cephadm/test_cephadm.sh @@ -10,6 +10,7 @@ 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'} @@ -172,6 +173,9 @@ function nfs_stop() $SUDO $CEPHADM check-host ## version + --image +$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' -- 2.47.3