diff options
author | Martin Polden <martin.polden@gmail.com> | 2017-06-12 11:24:00 +0200 |
---|---|---|
committer | Martin Polden <martin.polden@gmail.com> | 2017-06-12 11:34:59 +0200 |
commit | f71decc8e6d0c92ae2bfd76ab52227a65caccc82 (patch) | |
tree | 5a5aeda4e3f12034943b5ffc60c82a86315fd7b6 | |
parent | 81be9eb7c62743fb9245f6e73a8a844f50e06e3f (diff) |
Remove remaining docker-registry references in node-admin and docker-api
3 files changed, 4 insertions, 4 deletions
diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/RunSystemTests.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/RunSystemTests.java index 0b52d54c0dd..96e5584fb4b 100644 --- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/RunSystemTests.java +++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/RunSystemTests.java @@ -30,7 +30,7 @@ import static org.junit.Assert.assertEquals; * * * Example usage: - DockerImage vespaDockerBase = new DockerImage("docker-registry.ops.yahoo.com:4443/vespa/ci:6.52.35"); + DockerImage vespaDockerBase = new DockerImage("docker-registry.domain.tld:8080/vespa/ci:6.52.35"); Path pathToSystemtestsInHost = Paths.get("/home/valerijf/dev/systemtests"); RunSystemTests runSystemTests = new RunSystemTests(vespaDockerBase, pathToSystemtestsInHost); diff --git a/node-admin/README.md b/node-admin/README.md index 8352cbd3c43..bab4c17ffbf 100644 --- a/node-admin/README.md +++ b/node-admin/README.md @@ -31,7 +31,7 @@ implements all of the basic methods you need to get started. To start a local zone, simply run: ``` - DockerImage dockerImage = new DockerImage("docker-registry.ops.yahoo.com:4443/vespa/ci:6.111.21"); + DockerImage dockerImage = new DockerImage("docker-registry.domain.tld:8080/vespa/ci:6.111.21"); Path pathToVespaRoot = Paths.get("/home/valerijf/dev/vespa"); Path pathToContainerStorage = Paths.get("/home/docker/container-storage"); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/noderepository/NodeRepositoryImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/noderepository/NodeRepositoryImplTest.java index 15dce02f336..f5f98910694 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/noderepository/NodeRepositoryImplTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/noderepository/NodeRepositoryImplTest.java @@ -83,14 +83,14 @@ public class NodeRepositoryImplTest { } @Test - public void testGetContainersToRunAPi() throws IOException, InterruptedException { + public void testGetContainersToRunApi() throws IOException, InterruptedException { waitForJdiscContainerToServe(); NodeRepository nodeRepositoryApi = new NodeRepositoryImpl(requestExecutor, port, "dockerhost4"); final List<ContainerNodeSpec> containersToRun = nodeRepositoryApi.getContainersToRun(); assertThat(containersToRun.size(), is(1)); final ContainerNodeSpec nodeSpec = containersToRun.get(0); assertThat(nodeSpec.hostname, is("host4.yahoo.com")); - assertThat(nodeSpec.wantedDockerImage.get(), is(new DockerImage("docker-registry.ops.yahoo.com:4443/vespa/ci:6.42.0"))); + assertThat(nodeSpec.wantedDockerImage.get(), is(new DockerImage("docker-registry.domain.tld:8080/dist/vespa:6.42.0"))); assertThat(nodeSpec.nodeState, is(Node.State.reserved)); assertThat(nodeSpec.wantedRestartGeneration.get(), is(0L)); assertThat(nodeSpec.currentRestartGeneration.get(), is(0L)); |