Read <tester><nodes> from deployment spec for test/staging/prod

2 files changed, 11 insertions, 4 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java
index d877600db13..11f4c9794aa 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java
@@ -137,7 +137,7 @@ public class NodesSpecification {
         int defaultMinGroups =                           nodes.from().orElse(1) / groupSize.to().orElse(nodes.from().orElse(1));
         int defaultMaxGroups = groupSize.isEmpty() ? 1 : nodes.to().orElse(1) / groupSize.from().orElse(1);
 
-        var min = new ClusterResources(nodes.from().orElse(1),  groups.from().orElse(defaultMinGroups),  nodeResources(nodesElement).getFirst());
+        var min = new ClusterResources(nodes.from().orElse(1), groups.from().orElse(defaultMinGroups), nodeResources(nodesElement).getFirst());
         var max = new ClusterResources(nodes.to().orElse(1), groups.to().orElse(defaultMaxGroups), nodeResources(nodesElement).getSecond());
         return new ResourceConstraints(min, max, groupSize);
     }
diff --git a/config-model/src/main/resources/schema/deployment.rnc b/config-model/src/main/resources/schema/deployment.rnc
index 3491d868f20..f79fc614a53 100644
--- a/config-model/src/main/resources/schema/deployment.rnc
+++ b/config-model/src/main/resources/schema/deployment.rnc
@@ -2,6 +2,8 @@
 # RELAX NG Compact Syntax
 # Vespa Deployment file
 
+include "common.rnc"
+
 start = element deployment {
    attribute version { "1.0" } &
    attribute major-version { text }? &
@@ -100,7 +102,7 @@ Test = element test {
    attribute tester-flavor { xsd:string }? &
    attribute cloud-account { xsd:string }? &
    attribute empty-host-ttl { xsd:string }? &
-   text
+   Tester?
 }
 
 Staging = element staging {
@@ -108,7 +110,7 @@ Staging = element staging {
    attribute tester-flavor { xsd:string }? &
    attribute cloud-account { xsd:string }? &
    attribute empty-host-ttl { xsd:string }? &
-   text
+   Tester?
 }
 
 Dev = element dev {
@@ -129,7 +131,8 @@ Prod = element prod {
    Region* &
    Delay* &
    ProdTest* &
-   ParallelSteps*
+   ParallelSteps* &
+   Tester?
 }
 
 ProdTest = element test {
@@ -197,3 +200,7 @@ MemberRegion = element region {
     attribute fraction { xsd:double }? &
     text
 }
+
+Tester = element tester {
+    Nodes?
+}
\ No newline at end of file