From: Michael Fritch <mfritch@suse.com>
Date: Fri, 17 Apr 2020 20:17:02 +0000 (-0600)
Subject: qa/workunits/cephadm/test_cephadm.sh: add CLEANUP var
X-Git-Tag: v15.2.2~59^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aa10be44ab2938e2f538d6f5d3405bf630451ae5;p=ceph.git

qa/workunits/cephadm/test_cephadm.sh: add CLEANUP var

preserve the current test state during EXIT:
`CLEANUP=false ../qa/workunits/cephadm/test_cephadm.sh`

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 6b211447230d3b6d6d8d49b780750cf6aeeace6d)
---

diff --git a/qa/workunits/cephadm/test_cephadm.sh b/qa/workunits/cephadm/test_cephadm.sh
index ac9c922a97c0..1ea11aeeedb7 100755
--- a/qa/workunits/cephadm/test_cephadm.sh
+++ b/qa/workunits/cephadm/test_cephadm.sh
@@ -3,6 +3,9 @@
 SCRIPT_NAME=$(basename ${BASH_SOURCE[0]})
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
+# cleanup during exit
+[ -z "$CLEANUP" ] && CLEANUP=true
+
 FSID='00000000-0000-0000-0000-0000deadbeef'
 
 # images that are used
@@ -10,15 +13,6 @@ IMAGE_MASTER=${IMAGE_MASTER:-'quay.io/ceph-ci/ceph:octopus'} # octopus for octop
 IMAGE_NAUTILUS=${IMAGE_NAUTILUS:-'docker.io/ceph/daemon-base:latest-nautilus'}
 IMAGE_MIMIC=${IMAGE_MIMIC:-'docker.io/ceph/daemon-base:latest-mimic'}
 
-TMPDIR=$(mktemp -d)
-
-function cleanup()
-{
-    dump_all_logs $FSID
-    rm -rf $TMPDIR
-}
-trap cleanup EXIT
-
 OSD_IMAGE_NAME="${SCRIPT_NAME%.*}_osd.img"
 OSD_IMAGE_SIZE='6G'
 OSD_TO_CREATE=2
@@ -86,6 +80,26 @@ if ! [ "$loopdev" = "" ]; then
     $SUDO losetup -d $loopdev
 fi
 
+# TMPDIR for test data
+[ -d "$TMPDIR" ] || TMPDIR=$(mktemp -d tmp.$SCRIPT_NAME.XXXXXX)
+
+function cleanup()
+{
+    if [ $CLEANUP = false ]; then
+        # preserve the TMPDIR state
+        echo "========================"
+        echo "!!! CLEANUP=$CLEANUP !!!"
+        echo
+        echo "TMPDIR=$TMPDIR"
+        echo "========================"
+        return
+    fi
+
+    dump_all_logs $FSID
+    rm -rf $TMPDIR
+}
+trap cleanup EXIT
+
 function expect_false()
 {
         set -x
@@ -384,6 +398,9 @@ $CEPHADM --timeout 10 enter --fsid $FSID --name mon.a -- sleep 1
 $CEPHADM ceph-volume --fsid $FSID -- inventory --format=json \
       | jq '.[]'
 
+## preserve test state
+[ $CLEANUP = false ] && exit 0
+
 ## rm-daemon
 # mon and osd require --force
 expect_false $CEPHADM rm-daemon --fsid $FSID --name mon.a
@@ -394,5 +411,4 @@ $CEPHADM rm-daemon --fsid $FSID --name mgr.x
 expect_false $CEPHADM rm-cluster --fsid $FSID
 $CEPHADM rm-cluster --fsid $FSID --force
 
-rm -rf $TMPDIR
 echo PASS