From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Thu, 17 May 2018 22:55:23 +0000 (-0700)
Subject: Fix echo when removing venv in jjb-cleanup.sh
X-Git-Tag: v0.20.0~4
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F17%2F10717%2F2;p=releng%2Fglobal-jjb.git

Fix echo when removing venv in jjb-cleanup.sh

Missing 'echo' call causes this script to fail when it in truth
succeeds.

Change-Id: I95d798a34442fcf3ca172b3bdd43260db8a09f3c
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
---

diff --git a/shell/jjb-cleanup.sh b/shell/jjb-cleanup.sh
index 8f5a6260..9f3536a3 100644
--- a/shell/jjb-cleanup.sh
+++ b/shell/jjb-cleanup.sh
@@ -20,6 +20,7 @@ set -e -o pipefail
 # shellcheck source="$WORKSPACE/.jjb.properties" disable=SC1091
 source "$WORKSPACE/.jjb.properties"
 if [[ -n "$JJB_VENV" && "$JJB_VENV" =~ /tmp/.* ]]; then
-    rm -r "$JJB_VENV" && "$JJB_VENV removed"
+    rm -r "$JJB_VENV" && echo "$JJB_VENV removed"
+    unset JJB_VENV
 fi
 rm "$WORKSPACE/.jjb.properties"