Code Review
/
releng.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
(from parent 2:
e2412d8
)
Merge "Dont override blacklist if OVN"
author
Cedric Ollivier
<cedric.ollivier@orange.com>
Fri, 21 Feb 2020 23:09:57 +0000
(23:09 +0000)
committer
Gerrit Code Review
<gerrit@opnfv.org>
Fri, 21 Feb 2020 23:09:57 +0000
(23:09 +0000)
jjb/releng/opnfv-docker.sh
patch
|
blob
|
history
diff --git
a/jjb/releng/opnfv-docker.sh
b/jjb/releng/opnfv-docker.sh
index
de39f06
..
40e0ed6
100644
(file)
--- 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