Unify weave and launch.sh CNI setup

Test 830 has to run CNI plugin under sudo now
This commit is contained in:
Bryan Boreham committed 2016-12-06 11:52:09 +00:00
1 parent 882bff292e
commit ec21afb426
3 files changed
+43 -74

No files matched your search

+1 -1
View File
@@ -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 CNI_VERSION=1 CNI_COMMAND=ADD CNI_CONTAINERID=$id CNI_IFNAME=eth0 \
run_on $1 sudo CNI_VERSION=1 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
}