You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by tn...@apache.org on 2016/01/26 07:42:45 UTC
mesos git commit: Replaced busybox with alpine in docker tests.
Repository: mesos
Updated Branches:
refs/heads/master a6ca5d232 -> 8f38d1447
Replaced busybox with alpine in docker tests.
Review: https://reviews.apache.org/r/42674
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8f38d144
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8f38d144
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8f38d144
Branch: refs/heads/master
Commit: 8f38d14475fae071faa404237c440544b3a357c8
Parents: a6ca5d2
Author: Timothy Chen <tn...@gmail.com>
Authored: Fri Jan 22 18:36:14 2016 -0500
Committer: Timothy Chen <tn...@apache.org>
Committed: Mon Jan 25 22:42:30 2016 -0800
----------------------------------------------------------------------
src/examples/docker_no_executor_framework.cpp | 2 +-
.../docker_containerizer_tests.cpp | 28 ++++++++++----------
src/tests/containerizer/docker_tests.cpp | 10 +++----
src/tests/health_check_tests.cpp | 4 +--
src/tests/hook_tests.cpp | 2 +-
5 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/8f38d144/src/examples/docker_no_executor_framework.cpp
----------------------------------------------------------------------
diff --git a/src/examples/docker_no_executor_framework.cpp b/src/examples/docker_no_executor_framework.cpp
index 3b0ff42..cf7b4e1 100644
--- a/src/examples/docker_no_executor_framework.cpp
+++ b/src/examples/docker_no_executor_framework.cpp
@@ -103,7 +103,7 @@ public:
containerInfo.set_type(ContainerInfo::DOCKER);
ContainerInfo::DockerInfo dockerInfo;
- dockerInfo.set_image("busybox");
+ dockerInfo.set_image("alpine");
containerInfo.mutable_docker()->CopyFrom(dockerInfo);
task.mutable_container()->CopyFrom(containerInfo);
http://git-wip-us.apache.org/repos/asf/mesos/blob/8f38d144/src/tests/containerizer/docker_containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/docker_containerizer_tests.cpp b/src/tests/containerizer/docker_containerizer_tests.cpp
index 81ab362..645bdcf 100644
--- a/src/tests/containerizer/docker_containerizer_tests.cpp
+++ b/src/tests/containerizer/docker_containerizer_tests.cpp
@@ -478,7 +478,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Launch)
// TODO(tnachen): Use local image to test if possible.
ContainerInfo::DockerInfo dockerInfo;
- dockerInfo.set_image("busybox");
+ dockerInfo.set_image("alpine");
containerInfo.mutable_docker()->CopyFrom(dockerInfo);
task.mutable_command()->CopyFrom(command);
@@ -618,7 +618,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Kill)
// TODO(tnachen): Use local image to test if possible.
ContainerInfo::DockerInfo dockerInfo;
- dockerInfo.set_image("busybox");
+ dockerInfo.set_image("alpine");
containerInfo.mutable_docker()->CopyFrom(dockerInfo);
task.mutable_command()->CopyFrom(command);
@@ -734,7 +734,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Usage)
// TODO(tnachen): Use local image to test if possible.
ContainerInfo::DockerInfo dockerInfo;
- dockerInfo.set_image("busybox");
+ dockerInfo.set_image("alpine");
containerInfo.mutable_docker()->CopyFrom(dockerInfo);
task.mutable_command()->CopyFrom(command);
@@ -879,7 +879,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Update)
// TODO(tnachen): Use local image to test if possible.
ContainerInfo::DockerInfo dockerInfo;
- dockerInfo.set_image("busybox");
+ dockerInfo.set_image("alpine");
containerInfo.mutable_docker()->CopyFrom(dockerInfo);
task.mutable_command()->CopyFrom(command);
@@ -1027,7 +1027,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Recover)
// TODO(tnachen): Use local image to test if possible.
ContainerInfo::DockerInfo dockerInfo;
- dockerInfo.set_image("busybox");
+ dockerInfo.set_image("alpine");
containerInfo.mutable_docker()->CopyFrom(dockerInfo);
CommandInfo commandInfo;
@@ -1238,7 +1238,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Logs)
// TODO(tnachen): Use local image to test if possible.
ContainerInfo::DockerInfo dockerInfo;
- dockerInfo.set_image("busybox");
+ dockerInfo.set_image("alpine");
containerInfo.mutable_docker()->CopyFrom(dockerInfo);
task.mutable_command()->CopyFrom(command);
@@ -1773,7 +1773,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_SlaveRecoveryTaskContainer)
// TODO(tnachen): Use local image to test if possible.
ContainerInfo::DockerInfo dockerInfo;
- dockerInfo.set_image("busybox");
+ dockerInfo.set_image("alpine");
containerInfo.mutable_docker()->CopyFrom(dockerInfo);
task.mutable_command()->CopyFrom(command);
@@ -2123,7 +2123,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_NC_PortMapping)
// TODO(tnachen): Use local image to test if possible.
ContainerInfo::DockerInfo dockerInfo;
- dockerInfo.set_image("busybox");
+ dockerInfo.set_image("alpine");
dockerInfo.set_network(ContainerInfo::DockerInfo::BRIDGE);
ContainerInfo::DockerInfo::PortMapping portMapping;
@@ -2265,7 +2265,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_LaunchSandboxWithColon)
// TODO(tnachen): Use local image to test if possible.
ContainerInfo::DockerInfo dockerInfo;
- dockerInfo.set_image("busybox");
+ dockerInfo.set_image("alpine");
containerInfo.mutable_docker()->CopyFrom(dockerInfo);
task.mutable_command()->CopyFrom(command);
@@ -2380,7 +2380,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_DestroyWhileFetching)
// TODO(tnachen): Use local image to test if possible.
ContainerInfo::DockerInfo dockerInfo;
- dockerInfo.set_image("busybox");
+ dockerInfo.set_image("alpine");
containerInfo.mutable_docker()->CopyFrom(dockerInfo);
task.mutable_command()->CopyFrom(command);
@@ -2499,7 +2499,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_DestroyWhilePulling)
// TODO(tnachen): Use local image to test if possible.
ContainerInfo::DockerInfo dockerInfo;
- dockerInfo.set_image("busybox");
+ dockerInfo.set_image("alpine");
containerInfo.mutable_docker()->CopyFrom(dockerInfo);
task.mutable_command()->CopyFrom(command);
@@ -2610,7 +2610,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_ExecutorCleanupWhenLaunchFailed)
containerInfo.set_type(ContainerInfo::DOCKER);
ContainerInfo::DockerInfo dockerInfo;
- dockerInfo.set_image("busybox");
+ dockerInfo.set_image("alpine");
containerInfo.mutable_docker()->CopyFrom(dockerInfo);
task.mutable_command()->CopyFrom(command);
@@ -2719,7 +2719,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_FetchFailure)
containerInfo.set_type(ContainerInfo::DOCKER);
ContainerInfo::DockerInfo dockerInfo;
- dockerInfo.set_image("busybox");
+ dockerInfo.set_image("alpine");
containerInfo.mutable_docker()->CopyFrom(dockerInfo);
task.mutable_command()->CopyFrom(command);
@@ -2831,7 +2831,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_DockerPullFailure)
containerInfo.set_type(ContainerInfo::DOCKER);
ContainerInfo::DockerInfo dockerInfo;
- dockerInfo.set_image("busybox");
+ dockerInfo.set_image("alpine");
containerInfo.mutable_docker()->CopyFrom(dockerInfo);
task.mutable_command()->CopyFrom(command);
http://git-wip-us.apache.org/repos/asf/mesos/blob/8f38d144/src/tests/containerizer/docker_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/docker_tests.cpp b/src/tests/containerizer/docker_tests.cpp
index 9583070..f0ad20e 100644
--- a/src/tests/containerizer/docker_tests.cpp
+++ b/src/tests/containerizer/docker_tests.cpp
@@ -95,7 +95,7 @@ TEST_F(DockerTest, ROOT_DOCKER_interface)
containerInfo.set_type(ContainerInfo::DOCKER);
ContainerInfo::DockerInfo dockerInfo;
- dockerInfo.set_image("busybox");
+ dockerInfo.set_image("alpine");
containerInfo.mutable_docker()->CopyFrom(dockerInfo);
CommandInfo commandInfo;
@@ -268,7 +268,7 @@ TEST_F(DockerTest, ROOT_DOCKER_CheckCommandWithShell)
containerInfo.set_type(ContainerInfo::DOCKER);
ContainerInfo::DockerInfo dockerInfo;
- dockerInfo.set_image("busybox");
+ dockerInfo.set_image("alpine");
containerInfo.mutable_docker()->CopyFrom(dockerInfo);
CommandInfo commandInfo;
@@ -303,7 +303,7 @@ TEST_F(DockerTest, ROOT_DOCKER_CheckPortResource)
containerInfo.set_type(ContainerInfo::DOCKER);
ContainerInfo::DockerInfo dockerInfo;
- dockerInfo.set_image("busybox");
+ dockerInfo.set_image("alpine");
dockerInfo.set_network(ContainerInfo::DockerInfo::BRIDGE);
ContainerInfo::DockerInfo::PortMapping portMapping;
@@ -401,7 +401,7 @@ TEST_F(DockerTest, ROOT_DOCKER_MountRelative)
volume->set_mode(Volume::RO);
ContainerInfo::DockerInfo dockerInfo;
- dockerInfo.set_image("busybox");
+ dockerInfo.set_image("alpine");
containerInfo.mutable_docker()->CopyFrom(dockerInfo);
@@ -450,7 +450,7 @@ TEST_F(DockerTest, ROOT_DOCKER_MountAbsolute)
volume->set_mode(Volume::RO);
ContainerInfo::DockerInfo dockerInfo;
- dockerInfo.set_image("busybox");
+ dockerInfo.set_image("alpine");
containerInfo.mutable_docker()->CopyFrom(dockerInfo);
http://git-wip-us.apache.org/repos/asf/mesos/blob/8f38d144/src/tests/health_check_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/health_check_tests.cpp b/src/tests/health_check_tests.cpp
index 3606ce4..65e8fe2 100644
--- a/src/tests/health_check_tests.cpp
+++ b/src/tests/health_check_tests.cpp
@@ -348,7 +348,7 @@ TEST_F(HealthCheckTest, ROOT_DOCKER_DockerHealthyTask)
// TODO(tnachen): Use local image to test if possible.
ContainerInfo::DockerInfo dockerInfo;
- dockerInfo.set_image("busybox");
+ dockerInfo.set_image("alpine");
containerInfo.mutable_docker()->CopyFrom(dockerInfo);
vector<TaskInfo> tasks = populateTasks(
@@ -699,7 +699,7 @@ TEST_F(HealthCheckTest, ROOT_DOCKER_DockerHealthStatusChange)
// TODO(tnachen): Use local image to test if possible.
ContainerInfo::DockerInfo dockerInfo;
- dockerInfo.set_image("busybox");
+ dockerInfo.set_image("alpine");
containerInfo.mutable_docker()->CopyFrom(dockerInfo);
// Create a temporary file in host and then we could this file to make sure
http://git-wip-us.apache.org/repos/asf/mesos/blob/8f38d144/src/tests/hook_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/hook_tests.cpp b/src/tests/hook_tests.cpp
index 152984b..1a1bab4 100644
--- a/src/tests/hook_tests.cpp
+++ b/src/tests/hook_tests.cpp
@@ -686,7 +686,7 @@ TEST_F(HookTest, ROOT_DOCKER_VerifySlavePreLaunchDockerHook)
// TODO(tnachen): Use local image to test if possible.
ContainerInfo::DockerInfo dockerInfo;
- dockerInfo.set_image("busybox");
+ dockerInfo.set_image("alpine");
containerInfo.mutable_docker()->CopyFrom(dockerInfo);
task.mutable_command()->CopyFrom(command);