Use gliderlabs/alpine over ubuntu in attempt to speed up tests.
This commit is contained in:
1 parent
a5750dda2a
commit
5094e84af3
10 files changed
+12
-12
No files matched your search
@@ -10,8 +10,8 @@ start_suite "Ping over cross-host weave network"
|
||||
weave_on $HOST1 launch
|
||||
weave_on $HOST2 launch $HOST1
|
||||
|
||||
weave_on $HOST2 run $C2/24 -t --name=c2 ubuntu
|
||||
weave_on $HOST1 run $C1/24 -t --name=c1 ubuntu
|
||||
weave_on $HOST2 run $C2/24 -t --name=c2 gliderlabs/alpine /bin/sh
|
||||
weave_on $HOST1 run $C1/24 -t --name=c1 gliderlabs/alpine /bin/sh
|
||||
assert_raises "exec_on $HOST1 c1 ping -q -c 4 $C2"
|
||||
|
||||
end_suite
|
||||
@@ -10,8 +10,8 @@ start_suite "Ping over encrypted cross-host weave network"
|
||||
weave_on $HOST1 launch -password notverysecure
|
||||
weave_on $HOST2 launch -password notverysecure $HOST1
|
||||
|
||||
weave_on $HOST2 run $C2/24 -t --name=c2 ubuntu
|
||||
weave_on $HOST1 run $C1/24 -t --name=c1 ubuntu
|
||||
weave_on $HOST2 run $C2/24 -t --name=c2 gliderlabs/alpine /bin/sh
|
||||
weave_on $HOST1 run $C1/24 -t --name=c1 gliderlabs/alpine /bin/sh
|
||||
assert_raises "exec_on $HOST1 c1 ping -q -c 4 $C2"
|
||||
|
||||
end_suite
|
||||
@@ -34,7 +34,7 @@ start_suite "exposing weave network to host"
|
||||
weave_on $HOST1 launch
|
||||
|
||||
for c in $C1 $C2 $C3 $C4; do
|
||||
weave_on $HOST1 run ${c#*:}/24 -t --name=${c%:*} ubuntu
|
||||
weave_on $HOST1 run ${c#*:}/24 -t --name=${c%:*} gliderlabs/alpine /bin/sh
|
||||
done
|
||||
|
||||
# absence of host connectivity by default
|
||||
|
||||
@@ -10,7 +10,7 @@ start_suite "Resolve names on a single host"
|
||||
|
||||
weave_on $HOST1 launch-dns 10.2.254.1/24
|
||||
|
||||
weave_on $HOST1 run $C2/24 -t --name=c2 -h $NAME ubuntu
|
||||
weave_on $HOST1 run $C2/24 -t --name=c2 -h $NAME gliderlabs/alpine /bin/sh
|
||||
weave_on $HOST1 run --with-dns $C1/24 -t --name=c1 aanand/docker-dnsutils /bin/sh
|
||||
|
||||
assert_dns_record $HOST1 c1 $NAME $C2
|
||||
|
||||
@@ -14,7 +14,7 @@ weave_on $HOST2 launch $HOST1
|
||||
weave_on $HOST1 launch-dns 10.2.254.1/24 -debug
|
||||
weave_on $HOST2 launch-dns 10.2.254.2/24 -debug
|
||||
|
||||
weave_on $HOST2 run $C2/24 -t --name=c2 -h $NAME ubuntu
|
||||
weave_on $HOST2 run $C2/24 -t --name=c2 -h $NAME gliderlabs/alpine /bin/sh
|
||||
weave_on $HOST1 run --with-dns $C1/24 --name=c1 -t aanand/docker-dnsutils /bin/sh
|
||||
|
||||
assert_dns_record $HOST1 c1 $NAME $C2
|
||||
|
||||
@@ -11,7 +11,7 @@ start_suite "Resolve names in custom domain"
|
||||
|
||||
weave_on $HOST1 launch-dns 10.2.254.1/24 --domain $DOMAIN.
|
||||
|
||||
weave_on $HOST1 run $C2/24 -t --name=c2 -h $NAME ubuntu
|
||||
weave_on $HOST1 run $C2/24 -t --name=c2 -h $NAME gliderlabs/alpine /bin/sh
|
||||
weave_on $HOST1 run --with-dns $C1/24 -t --name=c1 aanand/docker-dnsutils /bin/sh
|
||||
|
||||
assert_dns_record $HOST1 c1 $NAME $C2
|
||||
|
||||
@@ -12,7 +12,7 @@ start_suite "Resolve unqualified names"
|
||||
|
||||
weave_on $HOST1 launch-dns 10.2.254.1/24
|
||||
|
||||
weave_on $HOST1 run $C1/24 -t --name=c1 -h $NAME ubuntu
|
||||
weave_on $HOST1 run $C1/24 -t --name=c1 -h $NAME gliderlabs/alpine /bin/sh
|
||||
weave_on $HOST1 run --with-dns $C2/24 -t --name=c2 -h seetwo.$DOMAIN aanand/docker-dnsutils /bin/sh
|
||||
weave_on $HOST1 run --with-dns $C3/24 -t --name=c3 --dns-search=weave.local aanand/docker-dnsutils /bin/sh
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ start_suite "Add and remove names on a single host"
|
||||
|
||||
weave_on $HOST1 launch-dns 10.2.254.1/24
|
||||
|
||||
weave_on $HOST1 run $C2/24 -t --name=c2 ubuntu
|
||||
weave_on $HOST1 run $C2/24 -t --name=c2 gliderlabs/alpine /bin/sh
|
||||
weave_on $HOST1 run --with-dns $C1/24 -t --name=c1 aanand/docker-dnsutils /bin/sh
|
||||
|
||||
weave_on $HOST1 dns-add $C2 c2 -h $NAME2
|
||||
|
||||
@@ -9,7 +9,7 @@ run_on $HOST1 sudo ./weave --local reset
|
||||
run_on $HOST1 sudo ./weave --local launch
|
||||
assert_raises "docker_on $HOST1 ps | grep weave"
|
||||
|
||||
run_on $HOST1 sudo ./weave --local run 10.2.6.5/24 -ti --name=c1 ubuntu
|
||||
run_on $HOST1 sudo ./weave --local run 10.2.6.5/24 -ti --name=c1 gliderlabs/alpine /bin/sh
|
||||
assert_raises "exec_on $HOST1 c1 ifconfig | grep ethwe"
|
||||
|
||||
end_suite
|
||||
@@ -58,7 +58,7 @@ assert_bridge_cidrs() {
|
||||
}
|
||||
|
||||
# Run container with three cidrs
|
||||
CID=$(DOCKER_HOST=tcp://$HOST1:2375 $WEAVE run 10.2.1.1/24 10.2.2.1/24 10.2.3.1/24 -t --name multicidr -h multicidr.weave.local ubuntu | cut -b 1-12)
|
||||
CID=$(DOCKER_HOST=tcp://$HOST1:2375 $WEAVE run 10.2.1.1/24 10.2.2.1/24 10.2.3.1/24 -t --name multicidr -h multicidr.weave.local gliderlabs/alpine /bin/sh | cut -b 1-12)
|
||||
assert_container_cidrs $HOST1 $CID 10.2.1.1/24 10.2.2.1/24 10.2.3.1/24
|
||||
assert_zone_records $HOST1 $CID multicidr.weave.local. 10.2.1.1 10.2.2.1 10.2.3.1
|
||||
|
||||
|
||||
Reference in new issue
Block a user