summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-03-16 12:05:46 +0100
committerHarald Musum <musum@verizonmedia.com>2020-03-16 12:05:46 +0100
commit2b9e3a131b79342f2887d1581333569c09c518ff (patch)
tree53a73128e48db97c68d0430bcde518f86bf5beba /configserver
parent5ecaa83f6ee186d13a1c0ae854ea17b067a289fd (diff)
Use docker image repo in ClusterSpec
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java
index f2c6aac2bda..97d90d8b6b6 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java
@@ -39,7 +39,8 @@ public class ZKApplicationPackageTest {
private static final Optional<Flavor> TEST_FLAVOR = new MockNodeFlavors().getFlavor(TEST_FLAVOR_NAME);
private static final AllocatedHosts ALLOCATED_HOSTS = AllocatedHosts.withHosts(
Collections.singleton(new HostSpec("foo.yahoo.com", Collections.emptyList(), TEST_FLAVOR, Optional.empty(),
- Optional.of(com.yahoo.component.Version.fromString("6.0.1")))));
+ Optional.of(Version.fromString("6.0.1")), Optional.empty(),
+ Optional.empty(), Optional.of("docker repo"))));
private ConfigCurator configCurator;
@@ -80,6 +81,8 @@ public class ZKApplicationPackageTest {
assertThat(Utf8.toString(toJson(readInfo)), is(Utf8.toString(toJson(ALLOCATED_HOSTS))));
assertThat(readInfo.getHosts().iterator().next().flavor(), is(TEST_FLAVOR));
assertEquals("6.0.1", readInfo.getHosts().iterator().next().version().get().toString());
+ // TODO: Enable when dockerImageRepo is written to zk
+ //assertEquals("docker repo", readInfo.getHosts().iterator().next().dockerImageRepo().get());
assertTrue(zkApp.getDeployment().isPresent());
assertEquals("mydisc", DeploymentSpec.fromXml(zkApp.getDeployment().get()).requireInstance("default").globalServiceId().get());
}