diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2018-05-18 15:54:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-05-18 15:54:12 +0000 |
| commit | 8b0887127cadeebadff89af51eede98ca69edc20 (patch) | |
| tree | 5cb84dd198e30d26837f807c6f684a1aeff83986 | |
| parent | 03ffe53f51867bfc21d025f50edce3370937830f (diff) | |
| parent | c038e447f30b2ade6b0f0b4ee9e7f2a21dd5b056 (diff) | |
Merge "Fix Docker Container Build Tagging"
| -rw-r--r-- | jjb/releng/opnfv-docker.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/jjb/releng/opnfv-docker.sh b/jjb/releng/opnfv-docker.sh index 5c8cafbe3..c89938b72 100644 --- a/jjb/releng/opnfv-docker.sh +++ b/jjb/releng/opnfv-docker.sh @@ -78,7 +78,14 @@ echo "Current branch: $BRANCH" BUILD_BRANCH=$BRANCH GERRIT_REFNAME=${GERRIT_REFNAME:-''} -RELEASE_VERSION=${GERRIT_REFNAME/refs\/tags//} +RELEASE_VERSION=${GERRIT_REFNAME/refs\/tags\/} + +# If we're being triggered by a comment-added job, then extract the tag +# from the comment and use that as the release version. +# Expected comment format: retag opnfv-x.y.z +if [[ "$GERRIT_EVENT_TYPE" == "comment-added" ]]; then + RELEASE_VERSION=$(echo "$GERRIT_EVENT_COMMENT_TEXT" | grep 'retag' | awk '{print $2}') +fi if [[ "$BRANCH" == "master" ]]; then DOCKER_TAG="latest" |