From f468d8bcae50575072f5e9df21e01b9de2527e3d Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Wed, 5 Jun 2024 20:44:31 +0200 Subject: Reduce staging test size to 5% --- .../src/main/java/com/yahoo/config/provision/CapacityPolicies.java | 2 +- .../vespa/hosted/provision/provisioning/DynamicAllocationTest.java | 2 +- .../com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java | 2 +- 3 files changed, 3 insertions(+), 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 index 818a448187c..7d44c4bb8e1 100644 --- 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 @@ public class CapacityPolicies { 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/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicAllocationTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicAllocationTest.java index a91902c8eba..ac141a81d58 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicAllocationTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicAllocationTest.java @@ -428,7 +428,7 @@ public class DynamicAllocationTest { ApplicationId application = ProvisioningTester.applicationId(); ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("test")).vespaVersion("1").build(); - List hosts = tester.prepare(application, cluster, 36, 2, resources); + List 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/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java index 9e6ae9f010c..0f8292bb310 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java @@ -638,7 +638,7 @@ public class ProvisioningTest { 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); } -- cgit v1.2.3