From aed640a862cb30fc3e3a4c224b9121dbd88684bf Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Fri, 8 Nov 2019 13:27:38 +0100 Subject: Update test which assumes test jobs must wait --- .../controller/deployment/DeploymentTriggerTest.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'controller-server') 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 9d17acc6a56..6b0f74fd8bf 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 @@ -577,21 +577,18 @@ public class DeploymentTriggerTest { assertEquals(firstTested, app.instance().deploymentJobs().jobStatus().get(stagingTest).lastTriggered().get().platform()); app.runJob(systemTest).runJob(stagingTest); - tester.readyJobsTrigger().maintain(); // Run only once, to trigger only the production jobs. - // Tests are not re-triggered, because the deployments that were tested have not yet been triggered on the tested versions. - assertEquals(firstTested, app.instance().deploymentJobs().jobStatus().get(systemTest).lastTriggered().get().platform()); - assertEquals(firstTested, app.instance().deploymentJobs().jobStatus().get(stagingTest).lastTriggered().get().platform()); - - // Finish old run of the aborted production job. - app.jobAborted(productionUsEast3); + // Test jobs for next production zone can start and run immediately. tester.triggerJobs(); - - // New upgrade is already tested for one of the jobs, which has now been triggered, and tests may run for the other job. assertNotEquals(firstTested, app.instance().deploymentJobs().jobStatus().get(systemTest).lastTriggered().get().platform()); assertNotEquals(firstTested, app.instance().deploymentJobs().jobStatus().get(stagingTest).lastTriggered().get().platform()); app.runJob(systemTest).runJob(stagingTest); + // Finish old run of the aborted production job. + app.jobAborted(productionUsEast3); + + // New upgrade is already tested for both jobs. + app.failDeployment(productionEuWest1).failDeployment(productionUsEast3) .runJob(productionEuWest1).runJob(productionUsEast3); // Both jobs fail again, and must be re-triggered -- this is ok, as they are both already triggered on their current targets. -- cgit v1.2.3