From f6af48a240ce1a030a8f50141f4bdd117d9ece20 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Mon, 15 Mar 2021 15:48:48 +0100 Subject: 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. --- .../java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java') 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 provisionInfraApplication(int nodeCount) { -- cgit v1.2.3