diff options
| -rwxr-xr-x | jjb/apex/apex-upload-artifact.sh | 7 |
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 |