summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>2016-01-14 00:38:44 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-01-14 09:31:08 +0000
commit9df77bc84d278b80dbd6af4591cbbe00d49c44c3 (patch)
treedd477a2334be4741b2971dbb14c5a851b436d141
parenta903d2ef3fb7650640e8d9ff4aca98b32da1c588 (diff)
yardstick ci bugfixes
Change-Id: I5db36005f5e5aaa5b219c381db48b3ec33a0994f JIRA:- Signed-off-by: Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>
-rw-r--r--jjb/yardstick/yardstick-ci-jobs.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 5e60cfd5d..354ae0678 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -112,7 +112,7 @@
builders:
- shell: |
#!/bin/bash
- set +e
+ set -e
# labconfig is used only for joid
labconfig=""
sshkey=""
@@ -132,7 +132,7 @@
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=${GERRIT_BRANCH}"
+ 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/}"
# Pull the latest image
docker pull opnfv/yardstick