diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2023-06-28 19:36:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-28 19:36:09 +0200 |
| commit | 684882aefca3060117a022b897ccd295d9172cc2 (patch) | |
| tree | 9813f1a48792798d4775b006a5e83469610814a7 | |
| parent | b7dab65bffc63820a75bdae788913796975f8815 (diff) | |
| parent | d53e3ac442418f4f247b0b9f00fae4f21d0ece45 (diff) | |
Merge pull request #27573 from vespa-engine/freva-patch-1
Fix region regex MERGEOK
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackage.java | 4 |
1 files changed, 2 insertions, 2 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 531cf239313..b4c9b2ebd57 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 @@ -231,8 +231,8 @@ public class TestPackage { .findFirst() .flatMap(step -> step.zones().get(0).testerFlavor()) .map(NodeResources::fromLegacyName) - .orElse(zone.region().value().matches("$(aws-)|(gcp-).*") ? DEFAULT_TESTER_RESOURCES_CLOUD - : DEFAULT_TESTER_RESOURCES); + .orElse(zone.region().value().matches("^(aws|gcp)-.*") ? DEFAULT_TESTER_RESOURCES_CLOUD + : DEFAULT_TESTER_RESOURCES); return nodeResources.with(NodeResources.DiskSpeed.any); } |