Code Review
/
ci-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Chore: Upgrade global-jjb to latest, v0.83.2
[ci-management.git]
/
jjb
/
shell
/
make-tar.sh
diff --git
a/jjb/shell/make-tar.sh
b/jjb/shell/make-tar.sh
index
76d730d
..
adc830d
100644
(file)
--- a/
jjb/shell/make-tar.sh
+++ b/
jjb/shell/make-tar.sh
@@
-20,9
+20,9
@@
dos2unix "${WORKSPACE}/version.properties"
source "$WORKSPACE/version.properties"
TARDIR=$UPLOAD_FILES_PATH
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"
rm -fr "$TARDIR"
-mkdir "$TARDIR"
if [ -n "$STAGING_BUILD" ]
then
if [ -n "$STAGING_BUILD" ]
then
@@
-33,9
+33,16
@@
else
[[ ! "$VERSION" =~ -SNAPSHOT$ ]] && VERSION="${VERSION}-SNAPSHOT"
fi
[[ ! "$VERSION" =~ -SNAPSHOT$ ]] && VERSION="${VERSION}-SNAPSHOT"
fi
+# STAGING_BUILD not used past this point
+set -u
+
if [ "$PROJECT" == "addon-onap" ]
then
if [ "$PROJECT" == "addon-onap" ]
then
+ # Make sure $TARDIR is an absolute path
+ mkdir "$TARDIR"
+ [[ "$TARDIR" != /* ]] && TARDIR="$PWD/$TARDIR"
+
# ONAP addon is special.
# Build the regional controller scripts tar ball
ARTIFACT_NAME="onap-amsterdam-regional-controller-${STREAM}"
# ONAP addon is special.
# Build the regional controller scripts tar ball
ARTIFACT_NAME="onap-amsterdam-regional-controller-${STREAM}"
@@
-55,7
+62,10
@@
else
TAR_NAME="${PROJECT}-${VERSION}.tgz"
echo "Making tar file ${TARDIR}/${TAR_NAME}"
TAR_NAME="${PROJECT}-${VERSION}.tgz"
echo "Making tar file ${TARDIR}/${TAR_NAME}"
- tar -cvzf "${TARDIR}/${TAR_NAME}" -- *
+ # Put the file in /tmp initially to prevent it $TARDIR from going into the tar file
+ tar -cvzf "/tmp/${TAR_NAME}" -- *
+ mkdir "$TARDIR"
+ cp "/tmp/${TAR_NAME}" "${TARDIR}/${TAR_NAME}"
fi
set +u +x
fi
set +u +x