diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-05-15 13:30:19 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-05-15 13:30:19 -0400 |
| commit | a5fb5bbc7863db32068b529d7109109e2c680f4a (patch) | |
| tree | 1153b2aebee28ad46524fa84e7d34e6f4777a9b7 | |
| parent | 8b14db775fa6668f2e4f7ced88e02d8713f4fa26 (diff) | |
Apex: fixes dev label names for artifacts
Change-Id: I2dae20c688ccd2cb690c01a843cb75d5743e129b
Signed-off-by: Tim Rozet <trozet@redhat.com>
| -rwxr-xr-x | jjb/apex/apex-build.sh | 3 | ||||
| -rwxr-xr-x | jjb/apex/apex-download-artifact.sh | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/jjb/apex/apex-build.sh b/jjb/apex/apex-build.sh index aaa0017de..58d9f1a40 100755 --- a/jjb/apex/apex-build.sh +++ b/jjb/apex/apex-build.sh @@ -10,7 +10,8 @@ echo [[ -d $CACHE_DIRECTORY ]] || mkdir -p $CACHE_DIRECTORY # set OPNFV_ARTIFACT_VERSION if echo $ARTIFACT_VERSION | grep "dev" 1> /dev/null; then - 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}" export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c $CACHE_DIRECTORY" elif echo $BUILD_TAG | grep "csit" 1> /dev/null; then export OPNFV_ARTIFACT_VERSION=csit${BUILD_NUMBER} diff --git a/jjb/apex/apex-download-artifact.sh b/jjb/apex/apex-download-artifact.sh index a921d61aa..0aced820c 100755 --- a/jjb/apex/apex-download-artifact.sh +++ b/jjb/apex/apex-download-artifact.sh @@ -9,7 +9,8 @@ APEX_PKGS="common undercloud" # removed onos for danube if [[ "$ARTIFACT_VERSION" =~ dev ]]; then # dev build - 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}" # get build artifact pushd ${BUILD_DIRECTORY} > /dev/null echo "Downloading packaged dev build..." |