Skip to content

Commit

Permalink
Use version 3 in the test
Browse files Browse the repository at this point in the history
CNI_VERSION env var was never used, so removed from the test script.
The second test is crashing on v1, so bumped to v3.
  • Loading branch information
bboreham authored and marccarre committed Mar 16, 2017
1 parent b5172f4 commit 31b7e06
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion test/830_cni_plugin_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand All @@ -30,6 +30,7 @@ EOF

cni_connect $HOST1 c2 <<EOF
{
"cniVersion": "0.3.0",
"name": "weave",
"type": "weave-net",
"ipam": {
Expand Down

0 comments on commit 31b7e06

Please sign in to comment.