Revert "Add a multi-instance app in deploynent api test"

2 files changed, 7 insertions, 29 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java
index b2c851a4b7d..3c23053eac0 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java
@@ -36,22 +36,17 @@ public class DeploymentApiTest extends ControllerContainerTest {
         DeploymentTester deploymentTester = new DeploymentTester(new ControllerTester(tester));
         Version version = Version.fromString("5.0");
         deploymentTester.controllerTester().upgradeSystem(version);
-        ApplicationPackage multiInstancePackage = new ApplicationPackageBuilder()
-                .instances("i1,i2")
-                .region("us-west-1")
-                .build();
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
+                .environment(Environment.prod)
                 .region("us-west-1")
                 .build();
 
         // 3 applications deploy on current system version
         var failingApp = deploymentTester.newDeploymentContext("tenant1", "application1", "default");
-        var productionApp = deploymentTester.newDeploymentContext("tenant2", "application2", "i1");
-        var otherProductionApp = deploymentTester.newDeploymentContext("tenant2", "application2", "i2");
+        var productionApp = deploymentTester.newDeploymentContext("tenant2", "application2", "default");
         var appWithoutDeployments = deploymentTester.newDeploymentContext("tenant3", "application3", "default");
         failingApp.submit(applicationPackage).deploy();
-        productionApp.submit(multiInstancePackage).runJob(JobType.systemTest).runJob(JobType.stagingTest).runJob(JobType.productionUsWest1);
-        otherProductionApp.runJob(JobType.systemTest).runJob(JobType.stagingTest).runJob(JobType.productionUsWest1);
+        productionApp.submit(applicationPackage).deploy();
 
         // Deploy once so that job information is stored, then remove the deployment
         appWithoutDeployments.submit(applicationPackage).deploy();
@@ -64,7 +59,7 @@ public class DeploymentApiTest extends ControllerContainerTest {
         // Applications upgrade, 1/2 succeed
         deploymentTester.upgrader().maintain();
         deploymentTester.triggerJobs();
-        productionApp.runJob(JobType.systemTest).runJob(JobType.stagingTest).runJob(JobType.productionUsWest1);
+        productionApp.deployPlatform(version);
         failingApp.runJob(JobType.systemTest).failDeployment(JobType.stagingTest);
         deploymentTester.triggerJobs();
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json
index fb445ac600a..a3a763e9634 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json
@@ -18,15 +18,6 @@
           "upgradePolicy": "default",
           "productionJobs": 1,
           "productionSuccesses": 1
-        },
-        {
-          "tenant": "tenant2",
-          "application": "application2",
-          "instance": "i2",
-          "url": "http://localhost:8080/application/v4/tenant/tenant2/application/application2",
-          "upgradePolicy": "default",
-          "productionJobs": 1,
-          "productionSuccesses": 1
         }
       ],
       "deployingApplications": []
@@ -40,10 +31,10 @@
       "systemVersion": true,
       "configServers": [
         {
-          "hostname": "config1.test"
+          "hostname":"config1.test"
         },
         {
-          "hostname": "config2.test"
+          "hostname":"config2.test"
         }
       ],
       "failingApplications": [
@@ -60,7 +51,7 @@
         {
           "tenant": "tenant2",
           "application": "application2",
-          "instance": "i1",
+          "instance": "default",
           "url": "http://localhost:8080/application/v4/tenant/tenant2/application/application2",
           "upgradePolicy": "default",
           "productionJobs": 1,
@@ -75,14 +66,6 @@
           "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1",
           "upgradePolicy": "default",
           "running": "staging-test"
-        },
-        {
-          "tenant": "tenant2",
-          "application": "application2",
-          "instance": "i2",
-          "url": "http://localhost:8080/application/v4/tenant/tenant2/application/application2",
-          "upgradePolicy": "default",
-          "running": "system-test"
         }
       ]
     }