summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2020-01-13 15:15:24 +0100
committerJon Bratseth <bratseth@verizonmedia.com>2020-01-13 15:15:24 +0100
commit6b11fb264925853fe1937b7db5095a0d79564188 (patch)
tree519a476cd8b0088ef469e4d2be5acea9af6850bd
parentee30a6f58539c2aef7c73a11f5e62818f2321020 (diff)
Allow multiple testers on the same parent
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java
index ab51fb13414..8b1afa42c50 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java
@@ -155,7 +155,7 @@ class NodeAllocation {
}
private boolean checkForClashingParentHost() {
- return zone.system() == SystemName.main && zone.environment().isProduction();
+ return zone.system() == SystemName.main && zone.environment().isProduction() && ! application.instance().isTester();
}
private boolean offeredNodeHasParentHostnameAlreadyAccepted(Collection<PrioritizableNode> accepted, Node offered) {