aboutsummaryrefslogtreecommitdiffstats
path: root/node-repository
diff options
context:
space:
mode:
authorHarald Musum <musum@yahoo-inc.com>2017-03-22 08:29:07 +0100
committerHarald Musum <musum@yahoo-inc.com>2017-03-22 08:29:07 +0100
commitdba2cdf397b7219c063bf1c6ae29c98655b601e4 (patch)
tree0b063c963c9ef7a5e903502eba43489afa13af9d /node-repository
parented969742b0d356ae76ab9bc1e30964cb824fa153 (diff)
Remove CI system, does not exist anymore
Diffstat (limited to 'node-repository')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java2
-rw-r--r--node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java9
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);