diff options
| author |   Trevor Bramwell <tbramwell@linuxfoundation.org> | 2017-10-19 17:34:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-19 17:34:07 +0000 |
| commit | 385cd4013386a26a74491968b27c552eeba1d2b1 (patch) | |
| tree | 7ccba388fc98bafdd9dd448d26fef4e346a15a53 | |
| parent | 2455aae3c44273b4354b796e061dfb57588e66a0 (diff) | |
| parent | 3e671c34f7b2c2b55439d6f83b201f4a4249ee48 (diff) | |
Merge "Update release tags for Docker builds"
| -rw-r--r-- | jjb/releng/opnfv-docker.sh | 10 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docker.yml | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/jjb/releng/opnfv-docker.sh b/jjb/releng/opnfv-docker.sh index 298d2af51..402099a91 100644 --- a/jjb/releng/opnfv-docker.sh +++ b/jjb/releng/opnfv-docker.sh @@ -78,8 +78,14 @@ BUILD_BRANCH=$BRANCH if [[ "$BRANCH" == "master" ]]; then DOCKER_TAG="latest" elif [[ -n "${RELEASE_VERSION-}" ]]; then - DOCKER_TAG=${BRANCH##*/}.${RELEASE_VERSION} - # e.g. danube.1.0, danube.2.0, danube.3.0 + DOCKER_TAG=${RELEASE_VERSION} + if git checkout ${RELEASE_VERSION}; then + echo "Successfully checked out the git tag ${RELEASE_VERSION}" + else + echo "The tag ${RELEASE_VERSION} doesn't exist in the repository. Existing tags are:" + git tag + exit 1 + fi else DOCKER_TAG="stable" fi diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml index f0020aea3..862e77ac8 100644 --- a/jjb/releng/opnfv-docker.yml +++ b/jjb/releng/opnfv-docker.yml @@ -211,7 +211,7 @@ - string: name: RELEASE_VERSION default: "" - description: "Release version, e.g. 1.0, 2.0, 3.0" + description: "Docker tag to be built, e.g. 5.0.0, opnfv-5.0.0, 5.0.RC1" - string: name: DOCKERFILE default: "{dockerfile}" |