aboutsummaryrefslogtreecommitdiffstats
path: root/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2021-03-15 15:48:48 +0100
committerMartin Polden <mpolden@mpolden.no>2021-03-15 15:48:48 +0100
commitf6af48a240ce1a030a8f50141f4bdd117d9ece20 (patch)
tree2cf8623c1ddf25706f9082c9db62bd57ef051169 /node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java
parent28791aaf2d574a903144334a1637fdf5c36d6bd2 (diff)
Set wantToDeprovision recursively
When requesting deprovisioning of a host we always want its children to lose their allocation (via parked), so that the host can be deprovisioned.
Diffstat (limited to 'node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java')
-rw-r--r--node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java
index 72788d5cdab..3047661e62b 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java
@@ -244,7 +244,10 @@ public class OsVersionsTest {
}
private NodeList retiringChildrenOf(Node parent) {
- return tester.nodeRepository().nodes().list().childrenOf(parent).matching(child -> child.status().wantToRetire());
+ return tester.nodeRepository().nodes().list()
+ .childrenOf(parent)
+ .matching(child -> child.status().wantToRetire() &&
+ child.status().wantToDeprovision());
}
private List<Node> provisionInfraApplication(int nodeCount) {