summaryrefslogtreecommitdiffstats
path: root/jjb/apex
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-05-15 15:01:19 -0400
committerTim Rozet <trozet@redhat.com>2017-05-15 15:01:19 -0400
commit04a31c06280769d1a209affa78839c48d850a434 (patch)
tree60ab4f89e8bd5c6fac349e5f625c5ec91b45b0bd /jjb/apex
parent02443d937d4a26e7abb22c10e6d5670895291cf2 (diff)
Apex: fix apex upload for images
Change-Id: Ibff76b1ce7cb4e071e576fd111bfff8af2cc2021 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'jjb/apex')
-rwxr-xr-xjjb/apex/apex-upload-artifact.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/jjb/apex/apex-upload-artifact.sh b/jjb/apex/apex-upload-artifact.sh
index c8862964c..f543e2d1b 100755
--- a/jjb/apex/apex-upload-artifact.sh
+++ b/jjb/apex/apex-upload-artifact.sh
@@ -15,7 +15,9 @@ echo
BUILD_DIRECTORY=$WORKSPACE/../$BUILD_DIRECTORY
-source $BUILD_DIRECTORY/../opnfv.properties
+if [[ ! "$ARTIFACT_VERSION" =~ dev ]]; then
+ source $BUILD_DIRECTORY/../opnfv.properties
+fi
importkey () {
# clone releng repository
@@ -85,7 +87,8 @@ uploadsnap () {
uploadimages () {
# Uploads dev tarball
- export OPNFV_ARTIFACT_VERSION="dev${GERRIT_CHANGE_NUMBER}${GERRIT_PATCHSET_NUMBER}"
+ GERRIT_PATCHSET_NUMBER=$(echo $GERRIT_REFSPEC | grep -Eo '[0-9]+$')
+ export OPNFV_ARTIFACT_VERSION="dev${GERRIT_CHANGE_NUMBER}_${GERRIT_PATCHSET_NUMBER}"
echo "Uploading development build tarball"
pushd $BUILD_DIRECTORY > /dev/null
tar czf apex-${OPNFV_ARTIFACT_VERSION}.tar.gz *.qcow2