diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2019-04-12 13:45:08 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2019-04-12 13:45:08 +0400 |
| commit | dd2505fed033cdd4c6a76fed951aeef35971079f (patch) | |
| tree | fd0af5cd42f53182efbeb82ed7a57af1c2a33237 | |
| parent | cc811ebb2a2548d286c6b122851a919fd129eadc (diff) | |
[functest] Get passed DOCKER_TAG for K8s scenarios
Change-Id: I4f88935e76f657f86fe598ada87717d5a739884b
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
| -rwxr-xr-x | jjb/functest/functest-k8.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jjb/functest/functest-k8.sh b/jjb/functest/functest-k8.sh index a4d80e10b..73e87d3ec 100755 --- 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 |