Merge pull request #31461 from vespa-engine/bratseth/reduce-staging-size

Reduce staging test size to 5%
vespa-engine · Jun 5, 2024 · 4f09ea3 · 4f09ea3
2 parents 256c6bf + f468d8b
commit 4f09ea3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/CapacityPolicies.java b/config-provisioning/src/main/java/com/yahoo/config/provision/CapacityPolicies.java
@@ -51,7 +51,7 @@ private int decideCount(int requested, boolean required, boolean isTester) {
         return switch (zone.environment()) {
             case dev, test -> 1;
             case perf -> Math.min(requested, 3);
-            case staging -> requested <= 1 ? requested : Math.max(2, requested / 10);
+            case staging -> requested <= 1 ? requested : Math.max(2, (int)(0.05 * requested));
             case prod -> requested;
         };
     }

diff --git a/...ry/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicAllocationTest.java b/...ry/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicAllocationTest.java
@@ -428,7 +428,7 @@ public void node_resources_are_reduced_in_staging() {
         ApplicationId application = ProvisioningTester.applicationId();
         ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("test")).vespaVersion("1").build();
 
-        List<HostSpec> hosts = tester.prepare(application, cluster, 36, 2, resources);
+        List<HostSpec> hosts = tester.prepare(application, cluster, 66, 2, resources);
         tester.activate(application, hosts);
         assertEquals(3, hosts.size());
         assertEquals(1, hosts.stream().map(host -> host.membership().get().cluster().group().get()).distinct().count());

diff --git a/...ository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java b/...ository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
@@ -638,7 +638,7 @@ public void staging_deployment_size() {
         ApplicationId application = ProvisioningTester.applicationId();
         tester.makeReadyHosts(14, defaultResources).activateTenantHosts();
         SystemState state = prepare(application, 1, 1, 1, 64, defaultResources, tester); // becomes 1, 1, 1, 1, 6
-        assertEquals(9, state.allHosts.size());
+        assertEquals(6, state.allHosts.size());
         tester.activate(application, state.allHosts);
     }