aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@vespa.ai>2024-06-05 20:44:31 +0200
committerJon Bratseth <bratseth@vespa.ai>2024-06-05 20:44:31 +0200
commitf468d8bcae50575072f5e9df21e01b9de2527e3d (patch)
treea08a90e3dab8a119b7d07242e65521b153897b2e
parent256c6bf5bf9b6fd226f7a28c3c15c09eff20a336 (diff)
Reduce staging test size to 5%
-rw-r--r--config-provisioning/src/main/java/com/yahoo/config/provision/CapacityPolicies.java2
-rw-r--r--node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicAllocationTest.java2
-rw-r--r--node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java2
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<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/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);
}