From: jose.lausuch <jose.lausuch@ericsson.com>
Date: Thu, 14 Jan 2016 12:20:34 +0000 (+0100)
Subject: yardstick: add DEPLOY_SCENARIO env var to functest docker
X-Git-Tag: brahmaputra.1.0~175
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F95%2F6695%2F3;p=releng.git

yardstick: add DEPLOY_SCENARIO env var to functest docker

In case you need it...

Change-Id: I73d90cbb38ad86cc42552060e38db2f1e50a8e99
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
---

diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 6283e5da1..31243ff4e 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -141,13 +141,16 @@
             fi
 
             opts="--privileged=true --rm"
-            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/}"
+            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
             docker pull opnfv/yardstick >$redirect
 
             # Run docker
-            cmd="sudo docker run ${opts} ${envs} ${labconfig} ${sshkey} opnfv/yardstick run_tests.sh ${YARDSTICK_DB_BACKEND} ${YARDSTICK_SUITE_NAME}"
+            cmd="sudo docker run ${opts} ${envs} ${labconfig} ${sshkey} opnfv/yardstick \
+                run_tests.sh ${YARDSTICK_DB_BACKEND} ${YARDSTICK_SUITE_NAME}"
             echo "Yardstick: Running docker cmd: ${cmd}"
             ${cmd}