From 31b7e063e7da3af12b8d3f7a61e2820273dc1511 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Wed, 15 Mar 2017 17:56:26 +0000 Subject: [PATCH] Use version 3 in the test CNI_VERSION env var was never used, so removed from the test script. The second test is crashing on v1, so bumped to v3. --- test/830_cni_plugin_test.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/830_cni_plugin_test.sh b/test/830_cni_plugin_test.sh index b5d2cd4a..f33485fe 100755 --- a/test/830_cni_plugin_test.sh +++ b/test/830_cni_plugin_test.sh @@ -7,7 +7,7 @@ start_suite "Test CNI plugin" cni_connect() { pid=$(container_pid $1 $2) id=$(docker_on $1 inspect -f '{{.Id}}' $2) - run_on $1 sudo CNI_VERSION=1 CNI_COMMAND=ADD CNI_CONTAINERID=$id CNI_IFNAME=eth0 \ + run_on $1 sudo CNI_COMMAND=ADD CNI_CONTAINERID=$id CNI_IFNAME=eth0 \ CNI_NETNS=/proc/$pid/ns/net CNI_PATH=/opt/cni/bin /opt/cni/bin/weave-net } @@ -30,6 +30,7 @@ EOF cni_connect $HOST1 c2 <