diff options
| author |   jose.lausuch <jose.lausuch@ericsson.com> | 2015-12-09 16:02:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-12-09 16:02:18 +0000 |
| commit | ecefe9f1490144b0d8ebc982acb472fa9ec4e774 (patch) | |
| tree | 1ceefa0946299658ed9416d81afcd2f663f45382 | |
| parent | e82320f8623d0eb4fe9add230166a96ba464da66 (diff) | |
| parent | 70d27c86a50340abe962a95c0da261f071c340f5 (diff) | |
Merge "Add yardstick docker cleanup builder in jjob"
| -rw-r--r-- | jjb/yardstick/yardstick.yml | 46 |
1 files changed, 28 insertions, 18 deletions
diff --git a/jjb/yardstick/yardstick.yml b/jjb/yardstick/yardstick.yml index 8a6edbb4c..b6a02dca3 100644 --- a/jjb/yardstick/yardstick.yml +++ b/jjb/yardstick/yardstick.yml @@ -169,6 +169,7 @@ - 'yardstick-trigger-{pod}' builders: + - 'yardstick-cleanup' - 'yardstick-fetch-os-creds' - 'yardstick-daily' @@ -188,24 +189,7 @@ echo "Yardstick: Run benchmark test suites ..." - # Remove old containers - docker ps | grep opnfv/yardstick |\ - awk '{print $1}' | xargs -r docker stop &>/dev/null - 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 + # Pull the latest image docker pull opnfv/yardstick # Test suites to run @@ -231,6 +215,32 @@ - shell: !include-raw ../../utils/fetch_os_creds.sh +- builder: + name: yardstick-cleanup + builders: + - shell: | + #!/bin/bash + + echo "Cleaning up docker containers/images..." + + # Remove previous running containers if exist + if [[ ! -z $(docker ps -a | grep opnfv/yardstick) ]]; then + echo "Removing existing opnfv/yardstick containers..." + docker ps | grep opnfv/yardstick | awk '{print $1}' | xargs docker stop + docker ps -a | grep opnfv/yardstick | awk '{print $1}' | xargs docker rm + fi + + # 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 + ######################## # parameter macros ######################## |