Take care of DeploymentTester stragglers

1 files changed, 17 insertions, 15 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java
index 1105a478e14..a60c195519a 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java
@@ -65,14 +65,14 @@ public class JobControllerApiHandlerHelperTest {
         tester.runJob(stagingTest);
         tester.runJob(productionUsCentral1);
 
-        tester.tester().readyJobTrigger().maintain();
+        tester.triggerJobs();
 
         // us-east-3 eats the deployment failure and fails before deployment, while us-west-1 fails after.
         tester.configServer().throwOnNextPrepare(new ConfigServerException(URI.create("url"), "ERROR!", INVALID_APPLICATION_PACKAGE, null));
         tester.runner().run();
         assertEquals(deploymentFailed, tester.jobs().last(instanceId, productionUsEast3).get().status());
 
-        ZoneId usWest1 = productionUsWest1.zone(tester.tester().controller().system());
+        ZoneId usWest1 = productionUsWest1.zone(tester.controller().system());
         tester.configServer().convergeServices(instanceId, usWest1);
         tester.configServer().convergeServices(testerId.id(), usWest1);
         tester.setEndpoints(instanceId, usWest1);
@@ -81,9 +81,9 @@ public class JobControllerApiHandlerHelperTest {
         tester.cloud().set(FAILURE);
         tester.runner().run();
         assertEquals(testFailure, tester.jobs().last(instanceId, productionUsWest1).get().status());
-        assertEquals(revision2, tester.instance().deployments().get(productionUsCentral1.zone(tester.tester().controller().system())).applicationVersion());
-        assertEquals(revision1, tester.instance().deployments().get(productionUsEast3.zone(tester.tester().controller().system())).applicationVersion());
-        assertEquals(revision2, tester.instance().deployments().get(productionUsWest1.zone(tester.tester().controller().system())).applicationVersion());
+        assertEquals(revision2, tester.instance().deployments().get(productionUsCentral1.zone(tester.controller().system())).applicationVersion());
+        assertEquals(revision1, tester.instance().deployments().get(productionUsEast3.zone(tester.controller().system())).applicationVersion());
+        assertEquals(revision2, tester.instance().deployments().get(productionUsWest1.zone(tester.controller().system())).applicationVersion());
 
         tester.clock().advance(Duration.ofMillis(1000));
 
@@ -91,24 +91,26 @@ public class JobControllerApiHandlerHelperTest {
         tester.newSubmission();
         tester.runJob(systemTest);
         tester.runJob(stagingTest);
-        tester.tester().readyJobTrigger().maintain(); // Starts a run for us-central-1.
-        tester.tester().readyJobTrigger().maintain(); // Starts a new staging test run.
+        tester.triggerJobs(); // Starts a run for us-central-1.
+        tester.triggerJobs(); // Starts a new staging test run.
         tester.runner().run();
         assertEquals(running, tester.jobs().last(instanceId, productionUsCentral1).get().status());
         assertEquals(running, tester.jobs().last(instanceId, stagingTest).get().status());
 
         // Staging is expired, and the job fails and won't be retried immediately.
-        tester.tester().controller().applications().deactivate(instanceId, stagingTest.zone(tester.tester().controller().system()));
+        tester.controller().applications().deactivate(instanceId, stagingTest.zone(tester.controller().system()));
         tester.runner().run();
         assertEquals(installationFailed, tester.jobs().last(instanceId, stagingTest).get().status());
 
         tester.clock().advance(Duration.ofMillis(100_000)); // More than the minute within which there are immediate retries.
-        tester.tester().readyJobTrigger().maintain();
+        tester.triggerJobs();
         assertEquals(installationFailed, tester.jobs().last(instanceId, stagingTest).get().status());
 
         // System upgrades to a new version, which won't yet start.
         Version platform = new Version("7.1");
-        tester.tester().upgradeSystem(platform);
+        tester.controllerTester().upgradeSystem(platform);
+        tester.upgrader().maintain();
+        tester.triggerJobs();
 
         // us-central-1 has started, deployed, and is installing. Deployment is not yet verified.
         // us-east-3 is waiting for the failed staging test and us-central-1, while us-west-1 is waiting only for us-central-1.
@@ -117,7 +119,7 @@ public class JobControllerApiHandlerHelperTest {
         // one success from revision2 to revision3 and one failure from revision1 to revision3.
         assertResponse(JobControllerApiHandlerHelper.runResponse(tester.jobs().runs(instanceId, stagingTest), URI.create("https://some.url:43/root")), "staging-runs.json");
         assertResponse(JobControllerApiHandlerHelper.runDetailsResponse(tester.jobs(), tester.jobs().last(instanceId, productionUsEast3).get().id(), "0"), "us-east-3-log-without-first.json");
-        assertResponse(JobControllerApiHandlerHelper.jobTypeResponse(tester.tester().controller(), instanceId, URI.create("https://some.url:43/root/")), "overview.json");
+        assertResponse(JobControllerApiHandlerHelper.jobTypeResponse(tester.controller(), instanceId, URI.create("https://some.url:43/root/")), "overview.json");
 
         tester.runJob(instanceId, JobType.devAwsUsEast2a, applicationPackage);
         assertResponse(JobControllerApiHandlerHelper.runResponse(tester.jobs().runs(instanceId, devAwsUsEast2a), URI.create("https://some.url:43/root")), "dev-aws-us-east-2a-runs.json");
@@ -128,7 +130,7 @@ public class JobControllerApiHandlerHelperTest {
         InternalDeploymentTester tester = new InternalDeploymentTester();
         tester.clock().setInstant(Instant.EPOCH);
 
-        ZoneId zone = JobType.devUsEast1.zone(tester.tester().controller().system());
+        ZoneId zone = JobType.devUsEast1.zone(tester.controller().system());
         tester.jobs().deploy(instanceId, JobType.devUsEast1, Optional.empty(), applicationPackage);
         tester.configServer().setLogStream("1554970337.935104\t17491290-v6-1.ostk.bm2.prod.ne1.yahoo.com\t5480\tcontainer\tstdout\tinfo\tERROR: Bundle canary-application [71] Unable to get module class path. (java.lang.NullPointerException)\n");
         assertResponse(JobControllerApiHandlerHelper.runDetailsResponse(tester.jobs(), tester.jobs().last(instanceId, devUsEast1).get().id(), null), "dev-us-east-1-log-first-part.json");
@@ -138,7 +140,7 @@ public class JobControllerApiHandlerHelperTest {
         tester.setEndpoints(instanceId, zone);
         tester.runner().run();
 
-        assertResponse(JobControllerApiHandlerHelper.jobTypeResponse(tester.tester().controller(), instanceId, URI.create("https://some.url:43/root")), "dev-overview.json");
+        assertResponse(JobControllerApiHandlerHelper.jobTypeResponse(tester.controller(), instanceId, URI.create("https://some.url:43/root")), "dev-overview.json");
         assertResponse(JobControllerApiHandlerHelper.runDetailsResponse(tester.jobs(), tester.jobs().last(instanceId, devUsEast1).get().id(), "9"), "dev-us-east-1-log-second-part.json");
     }
 
@@ -149,11 +151,11 @@ public class JobControllerApiHandlerHelperTest {
         var region = "us-west-1";
         var applicationPackage = new ApplicationPackageBuilder().region(region).build();
         // Deploy directly to production zone, like integration tests.
-        tester.tester().controller().applications().deploy(tester.instance().id(), ZoneId.from("prod", region),
+        tester.controller().applications().deploy(tester.instance().id(), ZoneId.from("prod", region),
                                                            Optional.of(applicationPackage),
                                                            new DeployOptions(true, Optional.empty(),
                                                                              false, false));
-        assertResponse(JobControllerApiHandlerHelper.jobTypeResponse(tester.tester().controller(), instanceId, URI.create("https://some.url:43/root/")),
+        assertResponse(JobControllerApiHandlerHelper.jobTypeResponse(tester.controller(), instanceId, URI.create("https://some.url:43/root/")),
                        "jobs-direct-deployment.json");
     }