From dd2505fed033cdd4c6a76fed951aeef35971079f Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Fri, 12 Apr 2019 13:45:08 +0400 Subject: [PATCH] [functest] Get passed DOCKER_TAG for K8s scenarios Change-Id: I4f88935e76f657f86fe598ada87717d5a739884b Signed-off-by: Michael Polenchuk --- jjb/functest/functest-k8.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.16.6