summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorJun Li <matthew.lijun@huawei.com>2016-08-25 01:39:50 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-25 01:39:50 +0000
commit0b66e0d6ba10996f124926d3506b78eaa9bcd8b8 (patch)
tree7c69e1db6c75bac183ff745bc79207de9973fc62 /jjb
parent6df249d8d9ce83c0a96ae233989e11e0ce06a452 (diff)
parent4e3b79e688d0cd0ed8e9fde1195ac25bddcfc268 (diff)
Merge "yardstick: Pull the right image for master and colorado branches"
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/yardstick/yardstick-daily.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/jjb/yardstick/yardstick-daily.sh b/jjb/yardstick/yardstick-daily.sh
index 7e9a65b82..b3705415f 100755
--- a/jjb/yardstick/yardstick-daily.sh
+++ b/jjb/yardstick/yardstick-daily.sh
@@ -33,11 +33,12 @@ envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
-e NODE_NAME=${NODE_NAME} -e EXTERNAL_NETWORK=${EXTERNAL_NETWORK} \
-e YARDSTICK_BRANCH=${GIT_BRANCH##origin/} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO}"
-# Pull the latest image
+# Pull the image with correct tag
+echo "Yardstick: Pulling image opnfv/yardstick:${DOCKER_TAG}"
docker pull opnfv/yardstick:$DOCKER_TAG >$redirect
# Run docker
-cmd="sudo docker run ${opts} ${envs} ${labconfig} ${sshkey} opnfv/yardstick \
+cmd="sudo docker run ${opts} ${envs} ${labconfig} ${sshkey} opnfv/yardstick:${DOCKER_TAG} \
exec_tests.sh ${YARDSTICK_DB_BACKEND} ${YARDSTICK_SCENARIO_SUITE_NAME}"
echo "Yardstick: Running docker cmd: ${cmd}"
${cmd}