From: Eby, Robert (re2429) <re2429@att.com>
Date: Mon, 3 Dec 2018 15:56:29 +0000 (-0500)
Subject: Fixed error that broke release builds
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=554df4e2751f34bc5274b29ee1c7538c6cdedbef;p=ci-management.git

Fixed error that broke release builds

Change-Id: I54aba7e13e20fcef582ba1450df89e65a11561b0
Signed-off-by: Eby, Robert (re2429) <re2429@att.com>
---

diff --git a/jjb/shell/make-tar.sh b/jjb/shell/make-tar.sh
index 43e5693..adc830d 100644
--- a/jjb/shell/make-tar.sh
+++ b/jjb/shell/make-tar.sh
@@ -20,7 +20,8 @@ dos2unix "${WORKSPACE}/version.properties"
 source "$WORKSPACE/version.properties"
 TARDIR=$UPLOAD_FILES_PATH
 
-set -e -u -x -o pipefail
+# STAGING_BUILD (below) may be unset
+set -e +u -x -o pipefail
 rm -fr "$TARDIR"
 
 if [ -n "$STAGING_BUILD" ]
@@ -32,6 +33,9 @@ else
     [[ ! "$VERSION" =~ -SNAPSHOT$ ]] && VERSION="${VERSION}-SNAPSHOT"
 fi
 
+# STAGING_BUILD not used past this point
+set -u
+
 if [ "$PROJECT" == "addon-onap" ]
 then