diff options
Diffstat (limited to 'node-repository')
2 files changed, 1 insertions, 10 deletions
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); |