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

remove useless swarm_manage_mesos function 

Signed-off-by: Victor Vieux <vieux@docker.com>
This commit is contained in:
Victor Vieux 2015-08-10 13:52:53 -07:00
parent 32320e4249
commit 6f52d113a4
7 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/integration/mesos/api/build.bats
View File

@ -11,7 +11,7 @@ function teardown() {
@test "mesos - docker build" { @test "mesos - docker build" {
start_docker 2 start_docker 2
start_mesos start_mesos
swarm_manage_mesos swarm_manage --cluster-driver mesos-experimental 127.0.0.1:$MESOS_MASTER_PORT
run docker_swarm images -q run docker_swarm images -q
[ "$status" -eq 0 ] [ "$status" -eq 0 ]

2
test/integration/mesos/api/commit.bats
View File

@ -11,7 +11,7 @@ function teardown() {
@test "mesos - docker commit" { @test "mesos - docker commit" {
start_docker_with_busybox 2 start_docker_with_busybox 2
start_mesos start_mesos
swarm_manage_mesos swarm_manage --cluster-driver mesos-experimental 127.0.0.1:$MESOS_MASTER_PORT
docker_swarm run -d -m 20m --name test_container busybox sleep 500 docker_swarm run -d -m 20m --name test_container busybox sleep 500

2
test/integration/mesos/api/events.bats
View File

@ -11,7 +11,7 @@ function teardown() {
@test "mesos - docker events" { @test "mesos - docker events" {
start_docker_with_busybox 2 start_docker_with_busybox 2
start_mesos start_mesos
swarm_manage_mesos swarm_manage --cluster-driver mesos-experimental 127.0.0.1:$MESOS_MASTER_PORT
# start events, report real time events to $log_file # start events, report real time events to $log_file
local log_file=$(mktemp) local log_file=$(mktemp)

3
test/integration/mesos/api/info.bats
View File

@ -11,7 +11,8 @@ function teardown() {
@test "mesos - docker info" { @test "mesos - docker info" {
start_docker 2 start_docker 2
start_mesos start_mesos
swarm_manage_mesos swarm_manage --cluster-driver mesos-experimental 127.0.0.1:$MESOS_MASTER_PORT
run docker_swarm info run docker_swarm info
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ "${output}" == *'Offers: 2'* ]] [[ "${output}" == *'Offers: 2'* ]]

3
test/integration/mesos/api/inspect.bats
View File

@ -11,7 +11,8 @@ function teardown() {
@test "mesos - docker inspect" { @test "mesos - docker inspect" {
start_docker_with_busybox 2 start_docker_with_busybox 2
start_mesos start_mesos
swarm_manage_mesos swarm_manage --cluster-driver mesos-experimental 127.0.0.1:$MESOS_MASTER_PORT
# run container # run container
docker_swarm run -d -m 20m -e TEST=true -h hostname.test --name test_container busybox sleep 500 docker_swarm run -d -m 20m -e TEST=true -h hostname.test --name test_container busybox sleep 500

6
test/integration/mesos/api/run.bats
View File

@ -11,7 +11,7 @@ function teardown() {
@test "mesos - docker run" { @test "mesos - docker run" {
start_docker_with_busybox 2 start_docker_with_busybox 2
start_mesos start_mesos
swarm_manage_mesos swarm_manage --cluster-driver mesos-experimental 127.0.0.1:$MESOS_MASTER_PORT
# make sure no container exist # make sure no container exist
run docker_swarm ps -qa run docker_swarm ps -qa
@ -31,7 +31,7 @@ function teardown() {
@test "mesos - docker run no resources" { @test "mesos - docker run no resources" {
start_docker 1 start_docker 1
start_mesos start_mesos
swarm_manage_mesos swarm_manage --cluster-driver mesos-experimental 127.0.0.1:$MESOS_MASTER_PORT
run docker_swarm run -d busybox ls run docker_swarm run -d busybox ls
[ "$status" -ne 0 ] [ "$status" -ne 0 ]
@ -41,7 +41,7 @@ function teardown() {
@test "mesos - docker run big" { @test "mesos - docker run big" {
start_docker_with_busybox 3 start_docker_with_busybox 3
start_mesos start_mesos
swarm_manage_mesos swarm_manage --cluster-driver mesos-experimental 127.0.0.1:$MESOS_MASTER_PORT
for i in `seq 1 100`; do for i in `seq 1 100`; do
docker_swarm run -d -m 20m busybox echo $i docker_swarm run -d -m 20m busybox echo $i

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

@ -2,6 +2,9 @@
load ../../helpers load ../../helpers
export SWARM_MESOS_TASK_TIMEOUT=30s
export SWARM_MESOS_USER=daemon
MESOS_IMAGE=dockerswarm/mesos:0.23 MESOS_IMAGE=dockerswarm/mesos:0.23
MESOS_MASTER_PORT=$(( ( RANDOM % 1000 ) + 10000 )) MESOS_MASTER_PORT=$(( ( RANDOM % 1000 ) + 10000 ))
@ -24,18 +27,6 @@ function start_mesos() {
done done
} }
# Start the swarm manager in background.
function swarm_manage_mesos() {
local current=${#DOCKER_CONTAINERS[@]}
local i=${#SWARM_MANAGE_PID[@]}
local port=$(($SWARM_BASE_PORT + $i))
local host=127.0.0.1:$port
"$SWARM_BINARY" -l debug manage -H "$host" --cluster-driver mesos-experimental --cluster-opt mesos.user=daemon 127.0.0.1:$MESOS_MASTER_PORT &
SWARM_MANAGE_PID[$i]=$!
SWARM_HOSTS[$i]=$host
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 $MESOS_MASTER" echo "Stopping $MESOS_MASTER"