Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[functest] Get passed DOCKER_TAG for K8s scenarios
[releng.git]
/
jjb
/
functest
/
functest-k8.sh
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}"
-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
set +e