From 5eaf13303848f91bd4ab2a441769d15fe5ffca9e Mon Sep 17 00:00:00 2001
From: Thomas Bechtold <tbechtold@suse.com>
Date: Wed, 6 Nov 2019 16:24:17 +0100
Subject: [PATCH] qa/standalone/test_ceph_daemon: Make container images
 configurable

Instead of hardcoding the images, make them configureable via
environment variables.
That way, downstream can use the script with custom images.

Signed-off-by: Thomas Bechtold <tbechtold@suse.com>
---
 qa/standalone/test_ceph_daemon.sh | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/qa/standalone/test_ceph_daemon.sh b/qa/standalone/test_ceph_daemon.sh
index 90380a8925cf7..f281c083f8282 100755
--- a/qa/standalone/test_ceph_daemon.sh
+++ b/qa/standalone/test_ceph_daemon.sh
@@ -1,7 +1,10 @@
 #!/bin/bash -ex
 
 FSID='00000000-0000-0000-0000-0000deadbeef'
-IMAGE='ceph/daemon-base:latest-master-devel'
+# images that are used
+IMAGE_MASTER=${IMAGE_MASTER:-'ceph/daemon-base:latest-master-devel'}
+IMAGE_NAUTILUS=${IMAGE_NAUTILUS:-'ceph/daemon-base:latest-nautilus'}
+IMAGE_MIMIC=${IMAGE_MIMIC:-'ceph/daemon-base:latest-mimic'}
 
 [ -z "$SUDO" ] && SUDO=sudo
 
@@ -53,11 +56,11 @@ function expect_false()
 }
 
 ## version + --image
-$SUDO $CEPH_DAEMON --image ceph/daemon-base:latest-nautilus version \
+$SUDO $CEPH_DAEMON --image $IMAGE_NAUTILUS version \
     | grep 'ceph version 14'
-$SUDO $CEPH_DAEMON --image ceph/daemon-base:latest-mimic version \
+$SUDO $CEPH_DAEMON --image $IMAGE_MIMIC version \
     | grep 'ceph version 13'
-$SUDO $CEPH_DAEMON --image $IMAGE version | grep 'ceph version'
+$SUDO $CEPH_DAEMON --image $IMAGE_MASTER version | grep 'ceph version'
 
 # try force docker; this won't work if docker isn't installed
 which docker && ( $SUDO $CEPH_DAEMON --docker version | grep 'ceph version' )
@@ -75,7 +78,7 @@ cat <<EOF > $ORIG_CONFIG
 [global]
 log to file = true
 EOF
-$SUDO $CEPH_DAEMON --image $IMAGE bootstrap \
+$SUDO $CEPH_DAEMON --image $IMAGE_MASTER bootstrap \
       --mon-id a \
       --mgr-id x \
       --mon-ip $IP \
@@ -111,7 +114,7 @@ $SUDO $CEPH_DAEMON ls | jq '.[]' | jq 'select(.name == "mgr.x").fsid' \
 
 ## deploy
 # add mon.b
-$SUDO $CEPH_DAEMON --image $IMAGE deploy --name mon.b \
+$SUDO $CEPH_DAEMON --image $IMAGE_MASTER deploy --name mon.b \
       --fsid $FSID \
       --mon-ip $IP:3301 \
       --keyring /var/lib/ceph/$FSID/mon.a/keyring \
@@ -127,7 +130,7 @@ $SUDO $CEPH_DAEMON shell --fsid $FSID --config $CONFIG --keyring $KEYRING -- \
       mon 'allow profile mgr' \
       osd 'allow *' \
       mds 'allow *' > $TMPDIR/keyring.mgr.y
-$SUDO $CEPH_DAEMON --image $IMAGE deploy --name mgr.y \
+$SUDO $CEPH_DAEMON --image $IMAGE_MASTER deploy --name mgr.y \
       --fsid $FSID \
       --keyring $TMPDIR/keyring.mgr.y \
       --config $CONFIG
@@ -162,8 +165,8 @@ $SUDO $CEPH_DAEMON unit --fsid $FSID --name mon.a -- enable
 $SUDO $CEPH_DAEMON unit --fsid $FSID --name mon.a -- is-enabled
 
 ## shell
-$SUDO $CEPH_DAEMON --image $IMAGE shell -- true
-$SUDO $CEPH_DAEMON --image $IMAGE shell --fsid $FSID -- test -d /var/log/ceph
+$SUDO $CEPH_DAEMON --image $IMAGE_MASTER shell -- true
+$SUDO $CEPH_DAEMON --image $IMAGE_MASTER shell --fsid $FSID -- test -d /var/log/ceph
 
 ## enter
 expect_false $SUDO $CEPH_DAEMON enter
@@ -174,7 +177,7 @@ expect_false $SUDO $CEPH_DAEMON enter --fsid $FSID --name mgr.x -- pidof ceph-mo
 $SUDO $CEPH_DAEMON enter --fsid $FSID --name mgr.x -- pidof ceph-mgr
 
 ## ceph-volume
-$SUDO $CEPH_DAEMON --image $IMAGE ceph-volume --fsid $FSID -- inventory --format=json \
+$SUDO $CEPH_DAEMON --image $IMAGE_MASTER ceph-volume --fsid $FSID -- inventory --format=json \
       | jq '.[]'
 
 ## rm-daemon
-- 
2.39.5