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

Merge pull request #1133 from vieux/use_0.23_mesos 

use mesos 0.23 in tests
This commit is contained in:
Andrea Luzzardi 2015-08-10 15:28:08 -07:00
parent 2b3759cd21 6f52d113a4
commit d580bf9b7b
9 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/integration/helpers.bash
View File

@ -98,7 +98,6 @@ function swarm_manage() {
local port=$(($SWARM_BASE_PORT + $i))
local host=127.0.0.1:$port
echo "$SWARM_BINARY" -l debug manage -H "$host" --heartbeat=1s $discovery
"$SWARM_BINARY" -l debug manage -H "$host" --heartbeat=1s $discovery &
SWARM_MANAGE_PID[$i]=$!
SWARM_HOSTS[$i]=$host

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

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

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

@ -11,7 +11,7 @@ function teardown() {
@test "mesos - docker commit" {
start_docker_with_busybox 2
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

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

@ -11,7 +11,7 @@ function teardown() {
@test "mesos - docker events" {
start_docker_with_busybox 2
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
local log_file=$(mktemp)

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

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

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

@ -11,7 +11,8 @@ function teardown() {
@test "mesos - docker inspect" {
start_docker_with_busybox 2
start_mesos
swarm_manage_mesos
swarm_manage --cluster-driver mesos-experimental 127.0.0.1:$MESOS_MASTER_PORT
# run container
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" {
start_docker_with_busybox 2
start_mesos
swarm_manage_mesos
swarm_manage --cluster-driver mesos-experimental 127.0.0.1:$MESOS_MASTER_PORT
# make sure no container exist
run docker_swarm ps -qa
@ -31,7 +31,7 @@ function teardown() {
@test "mesos - docker run no resources" {
start_docker 1
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
[ "$status" -ne 0 ]
@ -41,7 +41,7 @@ function teardown() {
@test "mesos - docker run big" {
start_docker_with_busybox 3
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
docker_swarm run -d -m 20m busybox echo $i

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

@ -2,7 +2,10 @@
load ../../helpers
MESOS_IMAGE=jimenez/mesos-dev:clang
export SWARM_MESOS_TASK_TIMEOUT=30s
export SWARM_MESOS_USER=daemon
MESOS_IMAGE=dockerswarm/mesos:0.23
MESOS_MASTER_PORT=$(( ( RANDOM % 1000 ) + 10000 ))
# Start mesos master and slave.
@ -10,7 +13,7 @@ function start_mesos() {
local current=${#DOCKER_CONTAINERS[@]}
MESOS_MASTER=$(
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-master --ip=127.0.0.1 --work_dir=/ --registry=in_memory --port=$MESOS_MASTER_PORT
)
retry 10 1 eval "docker_host ps | grep 'mesos-master'"
@ -18,20 +21,12 @@ function start_mesos() {
local docker_port=$(echo ${HOSTS[$i]} | cut -d: -f2)
MESOS_SLAVES[$i]=$(
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:$docker_port" --hostname=127.0.0.1 --port=$(($MESOS_MASTER_PORT + (1 + $i)))
$MESOS_IMAGE mesos-slave --master=127.0.0.1:$MESOS_MASTER_PORT --containerizers=docker --attributes="docker_port:$docker_port" --hostname=127.0.0.1 --port=$(($MESOS_MASTER_PORT + (1 + $i))) --docker=/usr/local/bin/docker --executor_environment_variables="{\"DOCKER_HOST\":\"${HOSTS[$i]}\"}"
)
retry 10 1 eval "docker_host ps | grep 'mesos-slave-$i'"
done
}
# Start the swarm manager in background.
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_PID=$!
retry 10 1 eval "docker_swarm info | grep 'Offers: $current'"
}
# Stop mesos master and slave.
function stop_mesos() {
echo "Stopping $MESOS_MASTER"

2
test/integration/test_runner.sh
View File

@ -12,7 +12,7 @@ function execute() {
}
# Tests to run. Defaults to all.
TESTS=${@:-. discovery api}
TESTS=${@:-. discovery api mesos/api}
# Generate a temporary binary for the tests.
export SWARM_BINARY=`mktemp`