diff options
| author | Harald Musum <musum@yahoo-inc.com> | 2016-11-01 08:56:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-01 08:56:11 +0100 |
| commit | 336cd9cdcf87830070d86ec698c290ec8ea1f5e6 (patch) | |
| tree | cafc5b2d7e290bf98ca456ae73adf3a41f25045f | |
| parent | 3ace741802046c207ae523eec3d66914458b49ac (diff) | |
| parent | 5e20dd6920ab6c821e3115bdd805e1285bd50ddd (diff) | |
Merge pull request #975 from yahoo/hakon/use-ci-image-for-local-zone
Use CI image for local zone
2 files changed, 3 insertions, 3 deletions
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 2d77c841ff8..1e93db42489 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 @@ -56,7 +56,7 @@ import static org.mockito.Mockito.when; */ public class RunVespaLocal { private static final DockerImage VESPA_BASE_IMAGE = new DockerImage( - System.getenv("VESPA_DOCKER_REGISTRY") + "/vespa/vespa-base:6.38.151"); + System.getenv("VESPA_DOCKER_REGISTRY") + "/vespa/ci:6.38.151"); private static final Environment environment = new Environment( Collections.singleton(LocalZoneUtils.CONFIG_SERVER_HOSTNAME), "prod", "vespa-local", HostName.getLocalhost(), new InetAddressResolver()); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java index fe37c3bbf60..ee04e07fd10 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java @@ -34,7 +34,7 @@ public class DockerProvisioningTest { tester.makeReadyDockerNodes(1, dockerFlavor, "dockerHost" + i); } - Optional<String> wantedDockerImage = Optional.of("docker-registry.ops.yahoo.com:4443/vespa/vespa-base:6.39"); + Optional<String> wantedDockerImage = Optional.of("docker-registry.ops.yahoo.com:4443/vespa/ci:6.39"); final int nodeCount = 7; List<HostSpec> hosts = tester.prepare(application1, ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("myContent"), wantedDockerImage), @@ -46,7 +46,7 @@ public class DockerProvisioningTest { assertEquals(dockerFlavor, nodes.asList().get(0).flavor().canonicalName()); // Upgrade Vespa version on nodes - Optional<String> upgradedWantedDockerImage = Optional.of("docker-registry.ops.yahoo.com:4443/vespa/vespa-base:6.40"); + Optional<String> upgradedWantedDockerImage = Optional.of("docker-registry.ops.yahoo.com:4443/vespa/ci:6.40"); List<HostSpec> upgradedHosts = tester.prepare(application1, ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("myContent"), upgradedWantedDockerImage), nodeCount, 1, dockerFlavor); |