summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorJingLu5 <lvjing5@huawei.com>2017-03-22 07:07:21 +0000
committerJingLu5 <lvjing5@huawei.com>2017-03-24 01:56:54 +0000
commit82a008dce2555b157f76f089b1ee464358c23728 (patch)
tree01b1fedb5fae4da58cc9e8b121d819e8eab0cb1f /jjb
parentaab72dd7c774290cc7529a2d5f823d89529945d3 (diff)
Use docker image id instead of tag to remove yardstick Docker image with tag:<None>
JIRA: RELENG-194 Now, in CI, bottlenecks job will pull yardstick Docker image again, which may cause the tag of the Docker image previous used by Yardstick changed to 'None'. Using 'None' tag to remove Docker image will cause error. Change-Id: I5c63c6c515ede5da4f6a40be6bb22fa6771f8f09 Signed-off-by: JingLu5 <lvjing5@huawei.com>
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/yardstick/yardstick-cleanup.sh16
1 files changed, 15 insertions, 1 deletions
diff --git a/jjb/yardstick/yardstick-cleanup.sh b/jjb/yardstick/yardstick-cleanup.sh
index 4e6f7d680..51455b593 100755
--- a/jjb/yardstick/yardstick-cleanup.sh
+++ b/jjb/yardstick/yardstick-cleanup.sh
@@ -1,6 +1,20 @@
#!/bin/bash
[[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
+# Remove containers along with image opnfv/yardstick*:<none>
+dangling_images=($(docker images -f "dangling=true" | grep opnfv/yardstick | awk '{print $3}'))
+if [[ -n ${dangling_images} ]]; then
+ echo "Removing opnfv/yardstick:<none> images and their containers..."
+ for image_id in "${dangling_images[@]}"; do
+ echo " Removing image_id: $image_id and its containers"
+ containers=$(docker ps -a | grep $image_id | awk '{print $1}')
+ if [[ -n "$containers" ]];then
+ docker rm -f $containers >${redirect}
+ fi
+ docker rmi $image_id >${redirect}
+ done
+fi
+
echo "Cleaning up docker containers/images..."
# Remove previous running containers if exist
if [[ ! -z $(docker ps -a | grep opnfv/yardstick) ]]; then
@@ -17,6 +31,6 @@ if [[ ! -z $(docker images | grep opnfv/yardstick) ]]; then
for tag in "${image_tags[@]}"; do
echo "Removing docker image opnfv/yardstick:$tag..."
docker rmi opnfv/yardstick:$tag >$redirect
-
done
fi
+