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

update a test to use 2 slaves 

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
This commit is contained in:
Victor Vieux 2015-06-12 17:30:27 -07:00 committed by Victor Vieux
parent 5a39d21707
commit 82d3d64b7e
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/integration/mesos/api.bats
View File

@ -9,12 +9,12 @@ function teardown() {
} }
@test "docker info" { @test "docker info" {
start_docker 1 start_docker 2
start_mesos start_mesos
swarm_manage_mesos swarm_manage_mesos
run docker_swarm info run docker_swarm info
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ "${output}" == *'Offers'* ]] [[ "${output}" == *'Offers: 2'* ]]
} }
@test "docker run no resources" { @test "docker run no resources" {

25
test/integration/mesos/mesos_helpers.bash
View File

@ -7,33 +7,36 @@ MESOS_MASTER_PORT=$(( ( RANDOM % 1000 ) + 10000 ))
# Start mesos master and slave. # Start mesos master and slave.
function start_mesos() { function start_mesos() {
local current=${#DOCKER_CONTAINERS[@]}
MESOS_MASTER=$( MESOS_MASTER=$(
docker_host run -d --name mesos-master --net=host \ docker_host run -d --name mesos-master --net=host \
$MESOS_IMAGE /mesos/build/bin/mesos-master.sh --ip=127.0.0.1 --work_dir=/ --registry=in_memory --port=$MESOS_MASTER_PORT $MESOS_IMAGE /mesos/build/bin/mesos-master.sh --ip=127.0.0.1 --work_dir=/ --registry=in_memory --port=$MESOS_MASTER_PORT
) )
retry 10 1 eval "docker_host ps | grep 'mesos-master'" retry 10 1 eval "docker_host ps | grep 'mesos-master'"
for ((i=0; i < current; i++)); do
MESOS_SLAVE=$( MESOS_SLAVES[$i]=$(
docker_host run --privileged -d --name mesos-slave --volumes-from node-0 -e DOCKER_HOST="${HOSTS[0]}" -v /sys/fs/cgroup:/sys/fs/cgroup --net=host \ docker_host run --privileged -d --name mesos-slave-$i --volumes-from node-$i -e DOCKER_HOST="${HOSTS[$i]}" -v /sys/fs/cgroup:/sys/fs/cgroup --net=host \
$MESOS_IMAGE /mesos/build/bin/mesos-slave.sh --master=127.0.0.1:$MESOS_MASTER_PORT --containerizers=docker --attributes="docker_port:${PORTS[0]}" --hostname=127.0.0.1 --port=$(($MESOS_MASTER_PORT + 1)) $MESOS_IMAGE /mesos/build/bin/mesos-slave.sh --master=127.0.0.1:$MESOS_MASTER_PORT --containerizers=docker --attributes="docker_port:${PORTS[$i]}" --hostname=127.0.0.1 --port=$(($MESOS_MASTER_PORT + (1 + $i)))
) )
retry 10 1 eval "docker_host ps | grep 'mesos-slave'" retry 10 1 eval "docker_host ps | grep 'mesos-slave-$i'"
done
} }
# Start the swarm manager in background. # Start the swarm manager in background.
function swarm_manage_mesos() { function swarm_manage_mesos() {
local current=${#DOCKER_CONTAINERS[@]}
"$SWARM_BINARY" -l debug manage -H "$SWARM_HOST" --cluster-driver mesos-experimental --cluster-opt mesos.user=daemon 127.0.0.1:$MESOS_MASTER_PORT & "$SWARM_BINARY" -l debug manage -H "$SWARM_HOST" --cluster-driver mesos-experimental --cluster-opt mesos.user=daemon 127.0.0.1:$MESOS_MASTER_PORT &
SWARM_PID=$! SWARM_PID=$!
retry 10 1 eval "docker_swarm info | grep 'Offers: 1'" retry 10 1 eval "docker_swarm info | grep 'Offers: $current'"
} }
# Stop mesos master and slave. # Stop mesos master and slave.
function stop_mesos() { function stop_mesos() {
echo "Stopping $DOCKER_CONTAINER"
docker_host rm -f -v $DOCKER_CONTAINER > /dev/null;
echo "Stopping $MESOS_MASTER" echo "Stopping $MESOS_MASTER"
docker_host rm -f -v $MESOS_MASTER > /dev/null; docker_host rm -f -v $MESOS_MASTER > /dev/null;
echo "Stopping $MESOS_SLAVE" for id in ${MESOS_SLAVES[@]}; do
docker_host rm -f -v $MESOS_SLAVE > /dev/null; echo "Stopping $id"
docker_host rm -f -v $id > /dev/null;
done
} }