summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>2015-12-07 20:08:36 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-12-08 16:02:07 +0000
commit4847bb11273ee0290fd950f219b51c7861e87b0a (patch)
tree08a80680e385458b7354ccb917e52d10009af1ab
parent946c0cac99fd4d66c45a60503b07e314001c78b4 (diff)
Updates for yardstick docker image
Docker image renamed: opnfv/yardstick-ci -> opnfv/yardstick and use POD_NAME for test suite selection. Change-Id: Ic4059799688eaeab565c9d9888a453a30b9d06cf Signed-off-by: Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>
-rw-r--r--jjb/yardstick/yardstick.yml27
1 files changed, 22 insertions, 5 deletions
diff --git a/jjb/yardstick/yardstick.yml b/jjb/yardstick/yardstick.yml
index 65d98621c..8a6edbb4c 100644
--- a/jjb/yardstick/yardstick.yml
+++ b/jjb/yardstick/yardstick.yml
@@ -189,13 +189,27 @@
echo "Yardstick: Run benchmark test suites ..."
# Remove old containers
- docker ps | grep opnfv/yardstick-ci |\
+ docker ps | grep opnfv/yardstick |\
awk '{print $1}' | xargs -r docker stop &>/dev/null
- docker ps -a | grep opnfv/yardstick-ci |\
+ docker ps -a | grep opnfv/yardstick |\
awk '{print $1}' | xargs -r docker rm &>/dev/null
+ # Remove existing images if exist
+ if [[ ! -z $(docker images | grep opnfv/yardstick) ]]; then
+ echo "Docker images to remove:"
+ docker images | head -1 && docker images | grep opnfv/yardstick
+ image_tags=($(docker images | grep opnfv/yardstick | awk '{print $2}'))
+ for tag in "${image_tags[@]}"; do
+ echo "Removing docker image opnfv/yardstick:$tag..."
+ docker rmi opnfv/yardstick:$tag
+ done
+ fi
+
# Make sure we have latest image
- docker pull opnfv/yardstick-ci
+ docker pull opnfv/yardstick
+
+ # Test suites to run
+ TEST_SUITES=opnfv_${POD_NAME}_daily.yaml
docker run \
--privileged=true \
@@ -203,8 +217,11 @@
-t \
-e "INSTALLER_TYPE=${INSTALLER_TYPE}" \
-e "INSTALLER_IP=${INSTALLER_IP}" \
- opnfv/yardstick-ci \
- run_benchmarks
+ -e "POD_NAME=${POD_NAME}" \
+ -e "EXTERNAL_NETWORK=net04_ext" \
+ opnfv/yardstick \
+ run_tests.sh \
+ $TEST_SUITES
echo "Yardstick: done!"