X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng%2Fopnfv-docker.sh;h=40e0ed6e22ffa994d7fb14aa1960a071f49174c3;hb=2039ffda9cced951523b1b8138f7406e2446c717;hp=de39f0628bb87485529807b0acaa25ed72cde6c6;hpb=46f75f47dc18e7c8c665d01edd3de9dc939e2615;p=releng.git diff --git a/jjb/releng/opnfv-docker.sh b/jjb/releng/opnfv-docker.sh index de39f0628..40e0ed6e2 100644 --- a/jjb/releng/opnfv-docker.sh +++ b/jjb/releng/opnfv-docker.sh @@ -105,7 +105,13 @@ fi if [[ "$BRANCH" == "master" ]]; then DOCKER_TAG="latest" -elif [[ -n "${RELEASE_VERSION-}" ]]; then +fi + +if [[ "$BRANCH" =~ "stable" ]]; then + DOCKER_TAG="stable" +fi + +if [[ -n "${RELEASE_VERSION-}" ]]; then DOCKER_TAG=${RELEASE_VERSION} if git checkout ${RELEASE_VERSION}; then echo "Successfully checked out the git tag ${RELEASE_VERSION}" @@ -114,8 +120,6 @@ elif [[ -n "${RELEASE_VERSION-}" ]]; then git tag exit 1 fi -else - DOCKER_TAG="stable" fi if [[ -n "${COMMIT_ID-}" && -n "${RELEASE_VERSION-}" ]]; then