diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2023-06-28 16:52:13 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-28 16:52:13 +0200 |
commit | b7dab65bffc63820a75bdae788913796975f8815 (patch) | |
tree | e9fea00042e31857eb2f50d82ca80125c3258af4 | |
parent | 609924b8259e689ee9bf39efb96f7ab7a011dd5e (diff) | |
parent | 1955a9f647ddbe6d03a59d7355a2dc627841ecc2 (diff) |
Merge pull request #27572 from vespa-engine/jonmv/same-tester-resources-in-gcp-and-aws
Use same tester resources in GCP as in AWS by default MERGEOK
2 files changed, 7 insertions, 8 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackage.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackage.java index eceaae80cef..531cf239313 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackage.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackage.java @@ -51,7 +51,6 @@ import java.util.jar.JarInputStream; import java.util.jar.Manifest; import java.util.regex.Pattern; -import static com.yahoo.vespa.hosted.controller.api.integration.deployment.TesterCloud.Suite.of; import static com.yahoo.vespa.hosted.controller.api.integration.deployment.TesterCloud.Suite.production; import static com.yahoo.vespa.hosted.controller.api.integration.deployment.TesterCloud.Suite.staging; import static com.yahoo.vespa.hosted.controller.api.integration.deployment.TesterCloud.Suite.staging_setup; @@ -74,7 +73,7 @@ public class TestPackage { // Must match exactly the advertised resources of an AWS instance type. Also consider that the container // will have ~1.8 GB less memory than equivalent resources in AWS (VESPA-16259). - static final NodeResources DEFAULT_TESTER_RESOURCES_AWS = new NodeResources(2, 8, 50, 0.3, NodeResources.DiskSpeed.any); + static final NodeResources DEFAULT_TESTER_RESOURCES_CLOUD = new NodeResources(2, 8, 50, 0.3, NodeResources.DiskSpeed.any); static final NodeResources DEFAULT_TESTER_RESOURCES = new NodeResources(1, 4, 50, 0.3, NodeResources.DiskSpeed.any); private final ApplicationPackageStream applicationPackageStream; @@ -232,8 +231,8 @@ public class TestPackage { .findFirst() .flatMap(step -> step.zones().get(0).testerFlavor()) .map(NodeResources::fromLegacyName) - .orElse(zone.region().value().contains("aws-") ? DEFAULT_TESTER_RESOURCES_AWS - : DEFAULT_TESTER_RESOURCES); + .orElse(zone.region().value().matches("$(aws-)|(gcp-).*") ? DEFAULT_TESTER_RESOURCES_CLOUD + : DEFAULT_TESTER_RESOURCES); return nodeResources.with(NodeResources.DiskSpeed.any); } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackageTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackageTest.java index e7109b551ed..f529d81bf32 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackageTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackageTest.java @@ -202,8 +202,8 @@ public class TestPackageTest { <instance id='first'> <test tester-flavor="d-6-16-100" /> <prod> - <region active="true">us-west-1</region> - <test>us-west-1</test> + <region active="true">gcp-us-west-1</region> + <test>gcp-us-west-1</test> </prod> </instance> <instance id='second'> @@ -221,8 +221,8 @@ public class TestPackageTest { </deployment> """); - NodeResources firstResources = TestPackage.testerResourcesFor(ZoneId.from("prod", "us-west-1"), spec.requireInstance("first")); - assertEquals(TestPackage.DEFAULT_TESTER_RESOURCES, firstResources); + NodeResources firstResources = TestPackage.testerResourcesFor(ZoneId.from("prod", "gcp-us-west-1"), spec.requireInstance("first")); + assertEquals(TestPackage.DEFAULT_TESTER_RESOURCES_CLOUD, firstResources); NodeResources secondResources = TestPackage.testerResourcesFor(ZoneId.from("prod", "us-west-1"), spec.requireInstance("second")); assertEquals(6, secondResources.vcpu(), 1e-9); |