From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Wed, 22 Apr 2020 13:31:19 +0000 (+0200)
Subject: qa/workunits/cephadm/test_cephadm: Also test octopus
X-Git-Tag: v16.1.0~2530^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F34688%2Fhead;p=ceph.git

qa/workunits/cephadm/test_cephadm: Also test octopus

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

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'