docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add mesos 

Signed-off-by: Victor Vieux <vieux@docker.com>
This commit is contained in:
Victor Vieux 2015-12-02 22:16:00 -08:00
parent 2ac860e335
commit a17f182026
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/integration/helpers.bash
View File

@ -87,15 +87,12 @@ function wait_until_reachable() {
# Returns true if all nodes have joined the swarm. # Returns true if all nodes have joined the swarm.
function discovery_check_swarm_info() { function discovery_check_swarm_info() {
local host="$1" local total="$1"
local total="$2"
[ -z "$total" ] && total="${#HOSTS[@]}" [ -z "$total" ] && total="${#HOSTS[@]}"
local host="$2"
[ -z "$host" ] && host="${SWARM_HOSTS[0]}"
if [ -z "$host" ]; then retry 10 1 eval "docker -H $host info | grep -q -e \"Nodes: $total\" -e \"Offers: $total\""
retry 10 1 $(docker_swarm info | grep -q "Nodes: $total")
else
retry 10 1 $(docker -H $host info | grep -q "Nodes: $total")
fi
} }
# Start the swarm manager in background. # Start the swarm manager in background.
@ -119,7 +116,7 @@ function swarm_manage() {
wait_until_reachable "$host" wait_until_reachable "$host"
# Wait for nodes to be discovered # Wait for nodes to be discovered
discovery_check_swarm_info "$host" discovery_check_swarm_info "${#HOSTS[@]}" "$host"
} }
# swarm join every engine created with `start_docker`. # swarm join every engine created with `start_docker`.

1
test/integration/mesos/zk/zk.bats
View File

@ -32,7 +32,6 @@ function teardown() {
start_mesos_zk $DISCOVERY start_mesos_zk $DISCOVERY
swarm_manage --cluster-driver mesos-experimental $DISCOVERY swarm_manage --cluster-driver mesos-experimental $DISCOVERY
sleep 5
run docker_swarm info run docker_swarm info
[ "$status" -eq 0 ] [ "$status" -eq 0 ]