From fc0b7c34d403e837c8e58ef4c3649d09f69f4230 Mon Sep 17 00:00:00 2001 From: Lasse Kaihlavirta Date: Mon, 14 Sep 2020 17:57:56 +0300 Subject: [PATCH] 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 Change-Id: I9771aae634efdbd5c571ab9e05de7886d8a07993 --- run-csit.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) 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" -- 2.16.6