diff options
| -rw-r--r-- | docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerTestUtils.java | 4 | ||||
| -rw-r--r-- | node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/RunVespaLocal.java | 14 |
2 files changed, 14 insertions, 4 deletions
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerTestUtils.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerTestUtils.java index 9af564ef23a..cca39aea316 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerTestUtils.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerTestUtils.java @@ -75,9 +75,9 @@ public class DockerTestUtils { docker.buildImage(dockerFileStream, dockerImage); } - private enum OS { Linux, Mac_OS_X, Unsupported } + public enum OS { Linux, Mac_OS_X, Unsupported } - private static OS getSystemOS() { + public static OS getSystemOS() { switch (System.getProperty("os.name").toLowerCase()) { case "linux": return OS.Linux; case "mac os x": return OS.Mac_OS_X; diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/RunVespaLocal.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/RunVespaLocal.java index b51a0d02f9a..ec5717f65b7 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/RunVespaLocal.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/RunVespaLocal.java @@ -41,12 +41,17 @@ import static org.mockito.Mockito.when; * VESPA_WEB_SERVICE_PORT="4080" * 3. Create /home/docker/container-storage with read/write permissions * 4. Update {@link RunVespaLocal#appPath} to point to the application you want deployed + * 5. Specify base image (see below) and download it with "docker pull <image>" + * + * Issues: + * + * 1. If you cannot make Docker Toolbox start, try starting Virtualbox and turn off the "default" machine * * @author freva */ public class RunVespaLocal { private static final DockerImage vespaBaseImage = - new DockerImage("docker-registry.ops.yahoo.com:4443/vespa/vespa-base:6.38.151"); + new DockerImage("docker-registry.ops.yahoo.com:4443/vespa/ci:6.40.185"); private static final Environment environment = new Environment( Collections.singleton(LocalZoneUtils.CONFIG_SERVER_HOSTNAME), "prod", "vespa-local", HostName.getLocalhost(), new InetAddressResolver()); @@ -60,7 +65,12 @@ public class RunVespaLocal { System.out.println(Defaults.getDefaults().vespaHome()); assumeTrue(DockerTestUtils.dockerDaemonIsPresent()); - when(maintainer.pathInHostFromPathInNode(any(), any())).thenCallRealMethod(); + DockerTestUtils.OS operatingSystem = DockerTestUtils.getSystemOS(); + if (operatingSystem == DockerTestUtils.OS.Mac_OS_X) { + when(maintainer.pathInHostFromPathInNode(any(), any())).thenReturn(Paths.get("/tmp/")); + } else { + when(maintainer.pathInHostFromPathInNode(any(), any())).thenCallRealMethod(); + } when(maintainer.pathInNodeAdminToNodeCleanup(any())).thenReturn(Paths.get("/tmp")); when(maintainer.pathInNodeAdminFromPathInNode(any(), any())).thenAnswer(invocation -> { Object[] args = invocation.getArguments(); |