diff options
4 files changed, 11 insertions, 10 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentInstanceSpec.java b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentInstanceSpec.java index 9ce1a48f226..a4be547fe70 100644 --- a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentInstanceSpec.java +++ b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentInstanceSpec.java @@ -277,9 +277,9 @@ public class DeploymentInstanceSpec extends DeploymentSpec.Steps { } /** Returns the host TTL to use for given environment and region, if any */ - public Optional<Duration> hostTTL(Environment environment, RegionName region) { + public Optional<Duration> hostTTL(Environment environment, Optional<RegionName> region) { return zones().stream() - .filter(zone -> zone.concerns(environment, Optional.of(region))) + .filter(zone -> zone.concerns(environment, region)) .findFirst() .flatMap(DeploymentSpec.DeclaredZone::hostTTL) .or(() -> hostTTL); diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java index 5e79ceb738f..f355a61fa8a 100644 --- a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java +++ b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java @@ -209,7 +209,7 @@ public class DeploymentSpec { * deploy to, e.g., test and staging zones, and want to avoid the delay of having to provision hosts. */ public Optional<Duration> hostTTL(InstanceName instance, Environment environment, RegionName region) { - return instance(instance).flatMap(spec -> spec.hostTTL(environment, region)) + return instance(instance).flatMap(spec -> spec.hostTTL(environment, Optional.of(region))) .or(this::hostTTL); } diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java index 013c161ad9b..e5578723612 100644 --- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java +++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java @@ -778,9 +778,9 @@ public class DeploymentSpecWithoutInstanceTest { DeploymentSpec spec = DeploymentSpec.fromXml(r); assertEquals(Optional.of(Duration.ofDays(1)), spec.hostTTL()); DeploymentInstanceSpec instance = spec.requireInstance("default"); - assertEquals(Optional.of(Duration.ofMinutes(1)), instance.hostTTL(prod, RegionName.from("us-east-1"))); - assertEquals(Optional.of(Duration.ofDays(1)), instance.hostTTL(prod, RegionName.from("us-west-1"))); - assertEquals(Optional.of(Duration.ofDays(1)), instance.hostTTL(test, RegionName.defaultName())); + assertEquals(Optional.of(Duration.ofMinutes(1)), instance.hostTTL(prod, Optional.of(RegionName.from("us-east-1")))); + assertEquals(Optional.of(Duration.ofDays(1)), instance.hostTTL(prod, Optional.of(RegionName.from("us-west-1")))); + assertEquals(Optional.of(Duration.ofDays(1)), instance.hostTTL(test, Optional.empty())); r = """ <deployment version='1.0' cloud-account='012345678912'> @@ -793,9 +793,9 @@ public class DeploymentSpecWithoutInstanceTest { spec = DeploymentSpec.fromXml(r); assertEquals(Optional.empty(), spec.hostTTL()); instance = spec.requireInstance("default"); - assertEquals(Optional.of(Duration.ofMinutes(1)), instance.hostTTL(prod, RegionName.from("us-east-1"))); - assertEquals(Optional.of(Duration.ofDays(1)), instance.hostTTL(prod, RegionName.from("us-west-1"))); - assertEquals(Optional.empty(), instance.hostTTL(test, RegionName.defaultName())); + assertEquals(Optional.of(Duration.ofMinutes(1)), instance.hostTTL(prod, Optional.of(RegionName.from("us-east-1")))); + assertEquals(Optional.of(Duration.ofDays(1)), instance.hostTTL(prod, Optional.of(RegionName.from("us-west-1")))); + assertEquals(Optional.empty(), instance.hostTTL(test, Optional.empty())); } private static Set<String> endpointRegions(String endpointId, DeploymentSpec spec) { 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 528b8cb71f3..eceaae80cef 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,6 +51,7 @@ 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; @@ -307,7 +308,7 @@ public class TestPackage { ? original.requireInstance(instance) .steps().stream().filter(step -> step.isTest() && step.concerns(zone.environment(), Optional.of(zone.region()))) .findFirst().flatMap(Step::hostTTL) - : original.requireInstance(instance).hostTTL(zone.environment(), zone.region())) + : original.requireInstance(instance).hostTTL(zone.environment(), Optional.of(zone.region()))) .filter(__ -> cloudAccount.isPresent()); String deploymentSpec = "<?xml version='1.0' encoding='UTF-8'?>\n" + |