diff options
4 files changed, 3 insertions, 16 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java index 060ca0a21c7..6c9d9d575f8 100755 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java @@ -71,7 +71,7 @@ public class ContainerClusterTest { @Test public void requreThatWeCanGetTheZoneConfig() { DeployState state = new DeployState.Builder().properties(new DeployProperties.Builder().hostedVespa(true).build()) - .zone(new Zone(SystemName.ci, Environment.test, RegionName.from("some-region"))).build(); + .zone(new Zone(SystemName.cd, Environment.test, RegionName.from("some-region"))).build(); MockRoot root = new MockRoot("foo", state); ContainerCluster cluster = new ContainerCluster(root, "container0", "container1"); ConfigserverConfig.Builder builder = new ConfigserverConfig.Builder(); @@ -79,7 +79,7 @@ public class ContainerClusterTest { ConfigserverConfig config = new ConfigserverConfig(builder); assertEquals(Environment.test.value(), config.environment()); assertEquals("some-region", config.region()); - assertEquals("ci", config.system()); + assertEquals("cd", config.system()); } private ContainerCluster createContainerCluster(boolean isHosted, boolean isCombinedCluster) { diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java b/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java index 662af4752ee..4800da9eaf5 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java @@ -7,9 +7,6 @@ package com.yahoo.config.provision; */ public enum SystemName { - /** System for continuous integration of latest Vespa and hosted Vespa code */ - ci, - /** System for continuous deployment where a pre-test of hosted Vespa combined with a verified Vespa version */ cd, @@ -22,7 +19,6 @@ public enum SystemName { public static SystemName from(String value) { switch (value) { - case "ci": return ci; case "cd": return cd; case "main": return main; default: throw new IllegalArgumentException(String.format("'%s' is not a valid system", value)); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java index 2a7121b3e7a..79c0eff874a 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java @@ -56,7 +56,7 @@ public class FailedExpirer extends Expirer { } private boolean failCountIndicatesHwFail(Zone zone) { - if (zone.system() == SystemName.cd || zone.system() == SystemName.ci) { + if (zone.system() == SystemName.cd) { return false; } return zone.environment() == Environment.prod || zone.environment() == Environment.staging; diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java index e73ca518beb..b5a9f688b87 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java @@ -60,15 +60,6 @@ public class FailedExpirerTest { } @Test - public void ensure_failed_nodes_are_deallocated_in_ci() throws InterruptedException { - NodeRepository nodeRepository = failureScenarioIn(SystemName.ci, Environment.prod); - - assertEquals(1, nodeRepository.getNodes(NodeType.tenant, Node.State.failed).size()); - assertEquals(2, nodeRepository.getNodes(NodeType.tenant, Node.State.dirty).size()); - assertEquals("node2", nodeRepository.getNodes(NodeType.tenant, Node.State.failed).get(0).hostname()); - } - - @Test public void ensure_failed_nodes_are_deallocated_in_cd() throws InterruptedException { NodeRepository nodeRepository = failureScenarioIn(SystemName.cd, Environment.prod); |