Avoid unlikely test scenario which conflicts with another unlikely test scenario

2 files changed, 1 insertions, 3 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java
index 2b764abb090..24cd92d005f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java
@@ -518,7 +518,6 @@ public class DeploymentStatus {
         boolean revisionReadyFirst = revisionReadyAt.get().isBefore(platformReadyAt.get());
         boolean failingUpgradeOnlyTests = ! jobs().type(systemTest(job.type()), stagingTest(job.type()))
                                                   .failingHardOn(Versions.from(change.withoutApplication(), application, deploymentFor(job), systemVersion))
-                                                  .matching(testJob -> ! testJob.isSuccess())
                                                   .isEmpty();
         switch (rollout) {
             case separate:      // Let whichever change rolled out first, keep rolling first, unless upgrade alone is failing.
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java
index 6fd2a8a6858..9e10ceee45b 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java
@@ -1030,12 +1030,11 @@ public class UpgraderTest {
 
         // Revision gets a second change when upgrade fixes the failing job.
         tester.clock().advance(Duration.ofDays(12)); // Time for retries.
-        app.runJob(systemTest).jobAborted(stagingTest).runJob(stagingTest);
+        app.runJob(systemTest).jobAborted(stagingTest).runJob(stagingTest).runJob(productionUsCentral1);
         tester.upgrader().run();
         tester.outstandingChangeDeployer().run();
 
         assertEquals(Change.of(version1).with(revision1.get()), app.instance().change());
-        app.runJob(productionUsCentral1); // Upgrade rolls.
         app.runJob(systemTest).runJob(stagingTest).runJob(productionUsCentral1); // Revision rolls.
         app.runJob(productionUsEast3).runJob(productionUsWest1); // Upgrade completes.
         app.runJob(productionUsEast3).runJob(productionUsWest1); // Revision completes.