Replaced the docker test executor with a smaller one.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/233e2d49 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/233e2d49 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/233e2d49 Branch: refs/heads/master Commit: 233e2d49376e5de3afacb38e6edf09347c869fb2 Parents: c7f7712 Author: Yifan Gu <[email protected]> Authored: Wed Jul 23 13:51:00 2014 -0700 Committer: Benjamin Hindman <[email protected]> Committed: Mon Aug 4 15:08:17 2014 -0700 ---------------------------------------------------------------------- src/tests/docker_containerizer_tests.cpp | 2 +- src/tests/environment.cpp | 33 +------------------- .../mesos_test_executor_docker_image/Dockerfile | 16 ---------- .../mesos_test_executor_docker_image/install.sh | 6 ---- 4 files changed, 2 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/233e2d49/src/tests/docker_containerizer_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/docker_containerizer_tests.cpp b/src/tests/docker_containerizer_tests.cpp index 1f5bc60..84324b0 100644 --- a/src/tests/docker_containerizer_tests.cpp +++ b/src/tests/docker_containerizer_tests.cpp @@ -229,7 +229,7 @@ TEST_F(DockerContainerizerTest, DOCKER_Launch_Executor) executorInfo.mutable_executor_id()->CopyFrom(executorId); CommandInfo command; command.set_value("test-executor"); - command.mutable_container()->set_image("docker:///mesos/test-executor"); + command.mutable_container()->set_image("docker:///mesosphere/test-executor"); executorInfo.mutable_command()->CopyFrom(command); task.mutable_executor()->CopyFrom(executorInfo); http://git-wip-us.apache.org/repos/asf/mesos/blob/233e2d49/src/tests/environment.cpp ---------------------------------------------------------------------- diff --git a/src/tests/environment.cpp b/src/tests/environment.cpp index b1c70e7..6c80fa3 100644 --- a/src/tests/environment.cpp +++ b/src/tests/environment.cpp @@ -144,38 +144,7 @@ static bool enable(const ::testing::TestInfo& test) } #ifdef __linux__ - if (user.get() == "root" && !validate.isError()) { - // Install docker test executor image for testing launching - // executor in docker image. - Try<process::Subprocess> install = - process::subprocess( - path::join( - flags.source_dir, - "src", - "tests", - "mesos_test_executor_docker_image", - "install.sh")); - - if (install.isError()) { - std::cerr - << "Unable to launch test executor install script: " - << install.error() - << std::endl; - return false; - } - - process::Future<Option<int> > status = install.get().status(); - status.await(Minutes(2)); - - if (!status.isReady() || !status.get().isSome() || status.get() != 0) { - std::cerr << "Unable to install test executor"; - return false; - } - - return true; - } - - return false; + return user.get() == "root" && !validate.isError(); #else return !validate.isError(); #endif http://git-wip-us.apache.org/repos/asf/mesos/blob/233e2d49/src/tests/mesos_test_executor_docker_image/Dockerfile ---------------------------------------------------------------------- diff --git a/src/tests/mesos_test_executor_docker_image/Dockerfile b/src/tests/mesos_test_executor_docker_image/Dockerfile deleted file mode 100644 index 8ecc374..0000000 --- a/src/tests/mesos_test_executor_docker_image/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM stackbrew/ubuntu:13.10 -MAINTAINER Timothy Chen <[email protected]> - -ADD http://downloads.mesosphere.io/master/ubuntu/13.10/mesos-test-executor.deb /tmp/mesos.deb - -RUN ["env", "DEBIAN_FRONTEND=noninteractive", "apt-get", "update"] -RUN ["env", "DEBIAN_FRONTEND=noninteractive", "apt-get", "install", "-y", "--fix-missing", "--force-yes", "libsasl2-2", "libcurl3"] -RUN ["env", "DEBIAN_FRONTEND=noninteractive", "apt-get", "install", "-y", "--fix-missing", "--force-yes", "default-jre-headless"] - -RUN ["env", "DEBIAN_FRONTEND=noninteractive", "dpkg", "-i", "/tmp/mesos.deb"] -RUN ["bash", "-c", "echo manual > /etc/init/mesos-master.override"] -RUN ["bash", "-c", "echo manual > /etc/init/mesos-slave.override"] - -RUN ["rm", "-rf", "/tmp/mesos.deb"] - -CMD ["true"] http://git-wip-us.apache.org/repos/asf/mesos/blob/233e2d49/src/tests/mesos_test_executor_docker_image/install.sh ---------------------------------------------------------------------- diff --git a/src/tests/mesos_test_executor_docker_image/install.sh b/src/tests/mesos_test_executor_docker_image/install.sh deleted file mode 100755 index dcec4e0..0000000 --- a/src/tests/mesos_test_executor_docker_image/install.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -docker images | cut -d" " -f1 | grep -q mesos/test-executor -if [ $? -ne 0 ]; then - docker build -t mesos/test-executor `dirname $0` -fi
