Remove unnecessary environment method from builder

10 files changed, 18 insertions, 94 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
index 1eb150c8a2b..a3b22ccd649 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
@@ -78,7 +78,6 @@ public class ControllerTest {
     public void testDeployment() {
         // Setup system
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .region("us-west-1")
                 .region("us-east-3")
                 .build();
@@ -140,7 +139,6 @@ public class ControllerTest {
 
         // Production zone for which there is no JobType is not allowed.
         applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .region("deep-space-9")
                 .build();
         try {
@@ -153,7 +151,6 @@ public class ControllerTest {
 
         // prod zone removal is not allowed
         applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .region("us-east-3")
                 .build();
         try {
@@ -173,7 +170,6 @@ public class ControllerTest {
         applicationPackage = new ApplicationPackageBuilder()
                 .allow(ValidationId.deploymentRemoval)
                 .upgradePolicy("default")
-                .environment(Environment.prod)
                 .region("us-east-3")
                 .build();
         context.submit(applicationPackage);
@@ -238,7 +234,6 @@ public class ControllerTest {
     public void testDnsAliasRegistration() {
         var context = tester.newDeploymentContext("tenant1", "app1", "default");
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .endpoint("default", "foo")
                 .region("us-west-1")
                 .region("us-central-1") // Two deployments should result in each DNS alias being registered once
@@ -267,7 +262,6 @@ public class ControllerTest {
     public void testDnsAliasRegistrationLegacy() {
         var context = tester.newDeploymentContext("tenant1", "app1", "default");
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .globalServiceId("foo")
                 .region("us-west-1")
                 .region("us-central-1") // Two deployments should result in each DNS alias being registered once
@@ -307,7 +301,6 @@ public class ControllerTest {
     public void testDnsAliasRegistrationWithEndpoints() {
         var context = tester.newDeploymentContext("tenant1", "app1", "default");
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .endpoint("foobar", "qrs", "us-west-1", "us-central-1")  // Rotation 01
                 .endpoint("default", "qrs", "us-west-1", "us-central-1") // Rotation 02
                 .endpoint("all", "qrs")                                  // Rotation 03
@@ -366,7 +359,6 @@ public class ControllerTest {
 
         // Application is deployed with endpoint pointing to 2/3 zones
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .endpoint("default", "qrs", west.region().value(), central.region().value())
                 .region(west.region().value())
                 .region(central.region().value())
@@ -384,7 +376,6 @@ public class ControllerTest {
 
         // Application is deployed with an additional endpoint
         ApplicationPackage applicationPackage2 = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .endpoint("default", "qrs", west.region().value(), central.region().value())
                 .endpoint("east", "qrs", east.region().value())
                 .region(west.region().value())
@@ -408,7 +399,6 @@ public class ControllerTest {
 
         // Application is deployed with default endpoint pointing to 3/3 zones
         ApplicationPackage applicationPackage3 = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .endpoint("default", "qrs", west.region().value(), central.region().value(), east.region().value())
                 .endpoint("east", "qrs", east.region().value())
                 .region(west.region().value())
@@ -429,7 +419,6 @@ public class ControllerTest {
 
         // Region is removed from an endpoint without override
         ApplicationPackage applicationPackage4 = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .endpoint("default", "qrs", west.region().value(), central.region().value())
                 .endpoint("east", "qrs", east.region().value())
                 .region(west.region().value())
@@ -450,7 +439,6 @@ public class ControllerTest {
 
         // Entire endpoint is removed without override
         ApplicationPackage applicationPackage5 = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .endpoint("east", "qrs", east.region().value())
                 .region(west.region().value())
                 .region(central.region().value())
@@ -469,7 +457,6 @@ public class ControllerTest {
 
         // ... override is added
         ApplicationPackage applicationPackage6 = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .endpoint("east", "qrs", east.region().value())
                 .region(west.region().value())
                 .region(central.region().value())
@@ -483,7 +470,6 @@ public class ControllerTest {
     public void testUnassignRotations() {
         var context = tester.newDeploymentContext();
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .endpoint("default", "qrs", "us-west-1", "us-central-1")
                 .region("us-west-1")
                 .region("us-central-1")
@@ -491,7 +477,6 @@ public class ControllerTest {
         context.submit(applicationPackage).deploy();
 
         ApplicationPackage applicationPackage2 = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .region("us-west-1")
                 .region("us-central-1")
                 .allow(ValidationId.globalEndpointChange)
@@ -513,7 +498,6 @@ public class ControllerTest {
         {
             var context = tester.newDeploymentContext("tenant1", "app1", "default");
             ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                    .environment(Environment.prod)
                     .endpoint("default", "foo")
                     .region("us-west-1")
                     .region("us-central-1") // Two deployments should result in each DNS alias being registered once
@@ -529,7 +513,6 @@ public class ControllerTest {
 
             // Application is deleted and rotation is unassigned
             applicationPackage = new ApplicationPackageBuilder()
-                    .environment(Environment.prod)
                     .allow(ValidationId.deploymentRemoval)
                     .allow(ValidationId.globalEndpointChange)
                     .build();
@@ -558,7 +541,6 @@ public class ControllerTest {
         {
             var context = tester.newDeploymentContext("tenant2", "app2", "default");
             ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                    .environment(Environment.prod)
                     .endpoint("default", "foo")
                     .region("us-west-1")
                     .region("us-central-1")
@@ -576,7 +558,6 @@ public class ControllerTest {
         {
             var context = tester.newDeploymentContext("tenant1", "app1", "default");
             ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                    .environment(Environment.prod)
                     .endpoint("default", "foo")
                     .region("us-west-1")
                     .region("us-central-1")
@@ -606,7 +587,6 @@ public class ControllerTest {
         tester.configServer().bootstrap(List.of(ZoneId.from("prod.cd-us-central-1")), SystemApplication.all());
         tester.controllerTester().upgradeSystem(six);
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .majorVersion(6)
                 .region("cd-us-central-1")
                 .build();
@@ -636,11 +616,7 @@ public class ControllerTest {
 
     @Test
     public void testDevDeployment() {
-        ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.dev)
-                .majorVersion(6)
-                .region("us-east-1")
-                .build();
+        ApplicationPackage applicationPackage = new ApplicationPackageBuilder().build();
 
         // Create application
         var context = tester.newDeploymentContext();
@@ -682,7 +658,6 @@ public class ControllerTest {
     public void testSuspension() {
         var context = tester.newDeploymentContext();
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                                                        .environment(Environment.prod)
                                                         .region("us-west-1")
                                                         .region("us-east-3")
                                                         .build();
@@ -703,7 +678,6 @@ public class ControllerTest {
     public void testDeletingApplicationThatHasAlreadyBeenDeleted() {
         var context = tester.newDeploymentContext();
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .region("us-east-3")
                 .region("us-west-1")
                 .build();
@@ -717,7 +691,6 @@ public class ControllerTest {
     @Test
     public void testDeployApplicationPackageWithApplicationDir() {
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .region("us-west-1")
                 .build(true);
         tester.newDeploymentContext().submit(applicationPackage);
@@ -727,7 +700,6 @@ public class ControllerTest {
     public void testDeployApplicationWithWarnings() {
         var context = tester.newDeploymentContext();
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .region("us-west-1")
                 .build();
         ZoneId zone = ZoneId.from("prod", "us-west-1");
@@ -750,7 +722,6 @@ public class ControllerTest {
         tester.controllerTester().zoneRegistry().exclusiveRoutingIn(ZoneApiMock.from(prodZone));
         var applicationPackage = new ApplicationPackageBuilder().athenzIdentity(AthenzDomain.from("domain"), AthenzService.from("service"))
                                                                 .compileVersion(RoutingController.DIRECT_ROUTING_MIN_VERSION)
-                                                                .environment(prodZone.environment())
                                                                 .region(prodZone.region())
                                                                 .build();
         // Deploy app1 in production
@@ -822,7 +793,6 @@ public class ControllerTest {
         var context = tester.newDeploymentContext();
         var applicationPackage = new ApplicationPackageBuilder()
                 .upgradePolicy("default")
-                .environment(Environment.prod)
                 .region("us-west-1")
                 .build();
 
@@ -936,7 +906,6 @@ public class ControllerTest {
 
         // Deploy application
         var applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .endpoint("default", "foo")
                 .region(west.region().value())
                 .region(east.region().value())
@@ -947,7 +916,6 @@ public class ControllerTest {
 
         // Redeploy with endpoint cluster changed needs override
         applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .endpoint("default", "bar")
                 .region(west.region().value())
                 .region(east.region().value())
@@ -967,7 +935,6 @@ public class ControllerTest {
 
         // Redeploy with override succeeds
         applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .endpoint("default", "bar")
                 .region(west.region().value())
                 .region(east.region().value())
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
index 2f2b1fbb364..9eaa15cdbe3 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
@@ -5,7 +5,6 @@ import com.yahoo.component.Version;
 import com.yahoo.config.application.api.ValidationId;
 import com.yahoo.config.provision.AthenzDomain;
 import com.yahoo.config.provision.AthenzService;
-import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.RegionName;
 import com.yahoo.security.SignatureAlgorithm;
 import com.yahoo.security.X509CertificateBuilder;
@@ -40,7 +39,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
  */
 public class ApplicationPackageBuilder {
 
-    private final StringBuilder environmentBody = new StringBuilder();
+    private final StringBuilder prodBody = new StringBuilder();
     private final StringBuilder validationOverridesBody = new StringBuilder();
     private final StringBuilder blockChange = new StringBuilder();
     private final StringJoiner notifications = new StringJoiner("/>\n  <email ",
@@ -52,7 +51,6 @@ public class ApplicationPackageBuilder {
     private OptionalInt majorVersion = OptionalInt.empty();
     private String instances = "default";
     private String upgradePolicy = null;
-    private Environment environment = Environment.prod;
     private String globalServiceId = null;
     private String athenzIdentityAttributes = null;
     private String searchDefinition = "search test { }";
@@ -75,11 +73,6 @@ public class ApplicationPackageBuilder {
         return this;
     }
 
-    public ApplicationPackageBuilder environment(Environment environment) {
-        this.environment = environment;
-        return this;
-    }
-
     public ApplicationPackageBuilder globalServiceId(String globalServiceId) {
         this.globalServiceId = globalServiceId;
         return this;
@@ -116,32 +109,32 @@ public class ApplicationPackageBuilder {
     }
 
     public ApplicationPackageBuilder region(RegionName regionName, boolean active) {
-        environmentBody.append("      <region active='")
-                       .append(active)
-                       .append("'>")
-                       .append(regionName.value())
-                       .append("</region>\n");
+        prodBody.append("      <region active='")
+                .append(active)
+                .append("'>")
+                .append(regionName.value())
+                .append("</region>\n");
         return this;
     }
 
     public ApplicationPackageBuilder test(String regionName) {
-        environmentBody.append("      <test>");
-        environmentBody.append(regionName);
-        environmentBody.append("</test>\n");
+        prodBody.append("      <test>");
+        prodBody.append(regionName);
+        prodBody.append("</test>\n");
         return this;
     }
 
     public ApplicationPackageBuilder parallel(String... regionName) {
-        environmentBody.append("    <parallel>\n");
+        prodBody.append("    <parallel>\n");
         Arrays.stream(regionName).forEach(this::region);
-        environmentBody.append("    </parallel>\n");
+        prodBody.append("    </parallel>\n");
         return this;
     }
 
     public ApplicationPackageBuilder delay(Duration delay) {
-        environmentBody.append("    <delay seconds='");
-        environmentBody.append(delay.getSeconds());
-        environmentBody.append("'/>\n");
+        prodBody.append("    <delay seconds='");
+        prodBody.append(delay.getSeconds());
+        prodBody.append("'/>\n");
         return this;
     }
 
@@ -236,18 +229,15 @@ public class ApplicationPackageBuilder {
         if (explicitStagingTest)
             xml.append("    <staging />\n");
         xml.append(blockChange);
-        xml.append("    <");
-        xml.append(environment.value());
+        xml.append("    <prod");
         if (globalServiceId != null) {
             xml.append(" global-service-id='");
             xml.append(globalServiceId);
             xml.append("'");
         }
         xml.append(">\n");
-        xml.append(environmentBody);
-        xml.append("    </");
-        xml.append(environment.value());
-        xml.append(">\n");
+        xml.append(prodBody);
+        xml.append("    </prod>\n");
         xml.append("    <endpoints>\n");
         xml.append(endpointsBody);
         xml.append("    </endpoints>\n");
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
index a38f71214b5..75829344597 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
@@ -72,7 +72,6 @@ public class DeploymentTriggerTest {
     public void testTriggerFailing() {
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
                 .upgradePolicy("default")
-                .environment(Environment.prod)
                 .region("us-west-1")
                 .build();
 
@@ -154,7 +153,6 @@ public class DeploymentTriggerTest {
     public void deploymentSpecWithDelays() {
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
                 .systemTest()
-                .environment(Environment.prod)
                 .delay(Duration.ofSeconds(30))
                 .region("us-west-1")
                 .delay(Duration.ofMinutes(2))
@@ -212,7 +210,6 @@ public class DeploymentTriggerTest {
     @Test
     public void deploymentSpecWithParallelDeployments() {
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .region("us-central-1")
                 .parallel("us-west-1", "us-east-3")
                 .region("eu-west-1")
@@ -251,7 +248,6 @@ public class DeploymentTriggerTest {
     public void testNoOtherChangesDuringSuspension() {
         // Application is deployed in 3 regions:
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .region("us-central-1")
                 .parallel("us-west-1", "us-east-3")
                 .build();
@@ -413,7 +409,6 @@ public class DeploymentTriggerTest {
     @Test
     public void applicationVersionIsNotDowngraded() {
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .region("us-central-1")
                 .region("eu-west-1")
                 .build();
@@ -456,7 +451,6 @@ public class DeploymentTriggerTest {
         var app1 = tester.newDeploymentContext("tenant1", "app1", "default");
         var app2 = tester.newDeploymentContext("tenant1", "app2", "default");
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .region("us-central-1")
                 .region("eu-west-1")
                 .build();
@@ -527,7 +521,6 @@ public class DeploymentTriggerTest {
     @Test
     public void eachParallelDeployTargetIsTested() {
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .parallel("eu-west-1", "us-east-3")
                 .build();
         // Application version 1 and platform version 6.1.
@@ -575,7 +568,6 @@ public class DeploymentTriggerTest {
     @Test
     public void retriesFailingJobs() {
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .region("us-central-1")
                 .build();
 
@@ -626,7 +618,6 @@ public class DeploymentTriggerTest {
     public void testPlatformVersionSelection() {
         // Setup system
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .region("us-west-1")
                 .build();
         Version version1 = tester.controller().readSystemVersion();
@@ -648,7 +639,6 @@ public class DeploymentTriggerTest {
         tester.controllerTester().upgradeSystem(version2);
 
         applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .region("us-west-1")
                 .region("us-east-3")
                 .build();
@@ -668,7 +658,6 @@ public class DeploymentTriggerTest {
     @Test
     public void requeueOutOfCapacityStagingJob() {
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .region("us-east-3")
                 .build();
 
@@ -777,7 +766,6 @@ public class DeploymentTriggerTest {
     public void testMultipleInstances() {
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
                 .instances("instance1,instance2")
-                .environment(Environment.prod)
                 .region("us-east-3")
                 .build();
         var app = tester.newDeploymentContext("tenant1", "application1", "instance1").submit(applicationPackage); // TODO jonmv: support instances in deployment context>
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentIssueReporterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentIssueReporterTest.java
index 4a739ce2722..9d6b1ba501f 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentIssueReporterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentIssueReporterTest.java
@@ -38,11 +38,9 @@ import static org.junit.Assert.assertTrue;
 public class DeploymentIssueReporterTest {
 
     private final static ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-            .environment(Environment.prod)
             .region("us-west-1")
             .build();
     private final static ApplicationPackage canaryPackage = new ApplicationPackageBuilder()
-            .environment(Environment.prod)
             .region("us-west-1")
             .upgradePolicy("canary")
             .build();
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java
index 062bd97f901..6e876d2e7db 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java
@@ -107,7 +107,6 @@ public class MetricsReporterTest {
     public void deployment_fail_ratio() {
         var tester = new DeploymentTester();
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .region("us-west-1")
                 .build();
         MetricsReporter metricsReporter = createReporter(tester.controller());
@@ -141,7 +140,6 @@ public class MetricsReporterTest {
     public void deployment_average_duration() {
         var tester = new DeploymentTester();
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .region("us-west-1")
                 .build();
 
@@ -187,7 +185,6 @@ public class MetricsReporterTest {
     public void deployments_failing_upgrade() {
         var tester = new DeploymentTester();
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .region("us-west-1")
                 .build();
 
@@ -237,7 +234,6 @@ public class MetricsReporterTest {
     public void deployment_warnings_metric() {
         var tester = new DeploymentTester();
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .region("us-west-1")
                 .region("us-east-3")
                 .build();
@@ -269,7 +265,6 @@ public class MetricsReporterTest {
     public void name_service_queue_size_metric() {
         var tester = new DeploymentTester();
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .globalServiceId("default")
                 .region("us-west-1")
                 .region("us-east-3")
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OutstandingChangeDeployerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OutstandingChangeDeployerTest.java
index 6c303bc2496..c8ded91514b 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OutstandingChangeDeployerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OutstandingChangeDeployerTest.java
@@ -30,7 +30,6 @@ public class OutstandingChangeDeployerTest {
         DeploymentTester tester = new DeploymentTester();
         OutstandingChangeDeployer deployer = new OutstandingChangeDeployer(tester.controller(), Duration.ofMinutes(10));
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .region("us-west-1")
                 .build();
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/RotationStatusUpdaterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/RotationStatusUpdaterTest.java
index 8df973454a1..5edf86410ad 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/RotationStatusUpdaterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/RotationStatusUpdaterTest.java
@@ -32,7 +32,6 @@ public class RotationStatusUpdaterTest {
 
         // Deploy application with global rotation
         var applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .globalServiceId("foo")
                 .region(zone1.region().value())
                 .region(zone2.region().value())
@@ -61,7 +60,6 @@ public class RotationStatusUpdaterTest {
 
         // Another rotation is assigned
         applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
                 .region(zone1.region().value())
                 .region(zone2.region().value())
                 .region(zone3.region().value())
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java
index 06d6bfc5321..5b33f989163 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java
@@ -97,7 +97,6 @@ public class ApplicationApiCloudTest extends ControllerContainerCloudTest {
     private ApplicationPackageBuilder prodBuilder() {
         return new ApplicationPackageBuilder()
                 .instances("default")
-                .environment(Environment.prod)
                 .region("aws-us-east-1a");
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
index e5d50c7d02d..7e097304790 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
@@ -116,7 +116,6 @@ public class ApplicationApiTest extends ControllerContainerTest {
 
     private static final ApplicationPackage applicationPackageDefault = new ApplicationPackageBuilder()
             .instances("default")
-            .environment(Environment.prod)
             .globalServiceId("foo")
             .region("us-central-1")
             .region("us-east-3")
@@ -126,7 +125,6 @@ public class ApplicationApiTest extends ControllerContainerTest {
 
     private static final ApplicationPackage applicationPackageInstance1 = new ApplicationPackageBuilder()
             .instances("instance1")
-            .environment(Environment.prod)
             .globalServiceId("foo")
             .region("us-central-1")
             .region("us-east-3")
@@ -332,7 +330,6 @@ public class ApplicationApiTest extends ControllerContainerTest {
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
                 .instances("instance1")
                 .globalServiceId("foo")
-                .environment(Environment.prod)
                 .region("us-west-1")
                 .region("us-east-3")
                 .allow(ValidationId.globalEndpointChange)
@@ -709,7 +706,6 @@ public class ApplicationApiTest extends ControllerContainerTest {
         // Second attempt has a service under a different domain than the tenant of the application, and fails.
         ApplicationPackage packageWithServiceForWrongDomain = new ApplicationPackageBuilder()
                 .instances("instance1")
-                .environment(Environment.prod)
                 .athenzIdentity(com.yahoo.config.provision.AthenzDomain.from(ATHENZ_TENANT_DOMAIN_2.getName()), AthenzService.from("service"))
                 .region("us-west-1")
                 .build();
@@ -723,7 +719,6 @@ public class ApplicationApiTest extends ControllerContainerTest {
         ApplicationPackage packageWithService = new ApplicationPackageBuilder()
                 .instances("instance1")
                 .globalServiceId("foo")
-                .environment(Environment.prod)
                 .athenzIdentity(com.yahoo.config.provision.AthenzDomain.from(ATHENZ_TENANT_DOMAIN.getName()), AthenzService.from("service"))
                 .region("us-central-1")
                 .parallel("us-west-1", "us-east-3")
@@ -770,7 +765,6 @@ public class ApplicationApiTest extends ControllerContainerTest {
         // Sixth attempt has a multi-instance deployment spec, and is accepted.
         ApplicationPackage multiInstanceSpec = new ApplicationPackageBuilder()
                 .instances("instance1,instance2")
-                .environment(Environment.prod)
                 .region("us-central-1")
                 .parallel("us-west-1", "us-east-3")
                 .endpoint("default", "foo", "us-central-1", "us-west-1", "us-east-3")
@@ -1338,7 +1332,6 @@ public class ApplicationApiTest extends ControllerContainerTest {
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
                 .upgradePolicy("default")
                 .athenzIdentity(com.yahoo.config.provision.AthenzDomain.from("another.domain"), com.yahoo.config.provision.AthenzService.from("service"))
-                .environment(Environment.prod)
                 .region("us-west-1")
                 .build();
         createAthenzDomainWithAdmin(ATHENZ_TENANT_DOMAIN, USER_ID);
@@ -1360,7 +1353,6 @@ public class ApplicationApiTest extends ControllerContainerTest {
         applicationPackage = new ApplicationPackageBuilder()
                 .upgradePolicy("default")
                 .athenzIdentity(com.yahoo.config.provision.AthenzDomain.from("domain1"), com.yahoo.config.provision.AthenzService.from("service"))
-                .environment(Environment.prod)
                 .region("us-west-1")
                 .build();
 
@@ -1493,7 +1485,6 @@ public class ApplicationApiTest extends ControllerContainerTest {
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
                 .athenzIdentity(com.yahoo.config.provision.AthenzDomain.from("domain"), AthenzService.from("service"))
                 .compileVersion(RoutingController.DIRECT_ROUTING_MIN_VERSION)
-                .environment(Environment.prod)
                 .instances("instance1")
                 .region(zone.region().value())
                 .build();
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
index a4c8bb8ef6d..76dc1bb582a 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
@@ -130,7 +130,6 @@ public class VersionStatusTest {
         DeploymentTester tester = new DeploymentTester();
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
                 .upgradePolicy("default")
-                .environment(Environment.prod)
                 .region("us-west-1")
                 .region("us-east-3")
                 .build();