]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/workunits/cephadm/test_cephadm: Also test octopus 34688/head
authorSebastian Wagner <sebastian.wagner@suse.com>
Wed, 22 Apr 2020 13:31:19 +0000 (15:31 +0200)
committerSebastian Wagner <sebastian.wagner@suse.com>
Wed, 22 Apr 2020 13:31:19 +0000 (15:31 +0200)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
qa/workunits/cephadm/test_cephadm.sh

index dd03453c6dc7dedb78ef459dcaf37a65c2b7ea09..fca69e1aa6b06cee51ccb1176ad776164c8e7f68 100755 (executable)
@@ -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'