Code Review
/
releng.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
| inline |
side by side
(from parent 1:
cc811eb
)
[functest] Get passed DOCKER_TAG for K8s scenarios
45/67545/1
author
Michael Polenchuk
<mpolenchuk@mirantis.com>
Fri, 12 Apr 2019 09:45:08 +0000
(13:45 +0400)
committer
Michael Polenchuk
<mpolenchuk@mirantis.com>
Fri, 12 Apr 2019 09:45:08 +0000
(13:45 +0400)
Change-Id: I4f88935e76f657f86fe598ada87717d5a739884b
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
jjb/functest/functest-k8.sh
patch
|
blob
|
history
diff --git
a/jjb/functest/functest-k8.sh
b/jjb/functest/functest-k8.sh
index
a4d80e1
..
73e87d3
100755
(executable)
--- a/
jjb/functest/functest-k8.sh
+++ b/
jjb/functest/functest-k8.sh
@@
-45,7
+45,7
@@
envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} \
-e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \
-e BUILD_TAG=${BUILD_TAG} -e DEPLOY_TYPE=${DEPLOY_TYPE}"
-DOCKER_TAG=
`[[ ${BRANCH##*/} == "master" ]] && echo "latest" || echo ${BRANCH##*/}`
+DOCKER_TAG=
${DOCKER_TAG:-$([[ ${BRANCH##*/} == "master" ]] && echo "latest" || echo ${BRANCH##*/})}
set +e