From adda1c459c872b3a54fbf079c20208fbb0a9627e Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Thu, 16 Jun 2016 18:03:45 +0100 Subject: [PATCH] Fix plugin filter - truncate Docker ID to 12 chars --- test/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/config.sh b/test/config.sh index 97574b27..f4e2c9a3 100644 --- a/test/config.sh +++ b/test/config.sh @@ -271,7 +271,7 @@ check_restart() { start_suite() { for host in $HOSTS; do [ -z "$DEBUG" ] || echo "Cleaning up on $host: removing all containers and resetting weave" - PLUGIN_FILTER=$(docker_on $host inspect -f 'grep -v {{.Id}}' weaveplugin 2>/dev/null) || PLUGIN_FILTER=cat + PLUGIN_FILTER=$(docker_on $host inspect -f 'grep -v {{printf "%.12s" .Id}}' weaveplugin 2>/dev/null) || PLUGIN_FILTER=cat rm_containers $host $(docker_on $host ps -aq 2>/dev/null | $PLUGIN_FILTER) weave_on $host reset 2>/dev/null done