From: Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>
Date: Mon, 14 Sep 2020 14:57:56 +0000 (+0300)
Subject: Check that variables for exit actions are defined
X-Git-Tag: 7.0.1~34^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=integration%2Fcsit.git;a=commitdiff_plain;h=fc0b7c34d403e837c8e58ef4c3649d09f69f4230

Check that variables for exit actions are defined

 - Check that $WORKSPACE and $WORKDIR variables are defined before
   using them on exit actions to prevent inappropriate behaviour
   on early failures (such as non-existent plans directory)

Issue-ID: INT-1721
Signed-off-by: Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>
Change-Id: I9771aae634efdbd5c571ab9e05de7886d8a07993
---

diff --git a/run-csit.sh b/run-csit.sh
index 634b0c7c..52d16932 100755
--- a/run-csit.sh
+++ b/run-csit.sh
@@ -24,14 +24,16 @@
 
 function on_exit(){
     rc=$?
-    rsync -av "$WORKDIR/" "$WORKSPACE/archives"
-
-    # Record list of active docker containers
-    docker ps --format "{{.Image}}" > "$WORKSPACE/archives/_docker-images.log"
-
-    # show memory consumption after all docker instances initialized
-    docker_stats | tee "$WORKSPACE/archives/_sysinfo-2-after-robot.txt"
-
+    if [[ ${WORKSPACE} ]]; then
+        if [[ ${WORKDIR} ]]; then
+            rsync -av "$WORKDIR/" "$WORKSPACE/archives"
+        fi
+        # Record list of active docker containers
+        docker ps --format "{{.Image}}" > "$WORKSPACE/archives/_docker-images.log"
+
+        # show memory consumption after all docker instances initialized
+        docker_stats | tee "$WORKSPACE/archives/_sysinfo-2-after-robot.txt"
+    fi
     # Run teardown script plan if it exists
     cd "${TESTPLANDIR}"
     TEARDOWN="${TESTPLANDIR}/teardown.sh"