Sort applications explicitly

2 files changed, 10 insertions, 6 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index c6fadb45161..85f94da2782 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -58,6 +58,7 @@ import java.time.Clock;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -136,12 +137,12 @@ public class ApplicationController {
 
     /** Returns a snapshot of all applications */
     public List<Application> asList() {
-        return db.listApplications();
+        return sort(db.listApplications());
     }
 
     /** Returns all applications of a tenant */
     public List<Application> asList(TenantName tenant) {
-        return db.listApplications(tenant);
+        return sort(db.listApplications(tenant));
     }
 
     /**
@@ -675,4 +676,9 @@ public class ApplicationController {
         return rotationRepository;
     }
 
+    /** Sort given list of applications by application ID */
+    private static List<Application> sort(List<Application> applications) {
+        return applications.stream().sorted(Comparator.comparing(Application::id)).collect(Collectors.toList());
+    }
+
 }
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 b7eff6d8448..58539bac211 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
@@ -12,7 +12,6 @@ import com.yahoo.vespa.hosted.controller.application.ApplicationPackage;
 import com.yahoo.vespa.hosted.controller.application.Deployment;
 import com.yahoo.vespa.hosted.controller.application.DeploymentJobs;
 import com.yahoo.vespa.hosted.controller.deployment.ApplicationPackageBuilder;
-import com.yahoo.vespa.hosted.controller.deployment.BuildJob;
 import com.yahoo.vespa.hosted.controller.deployment.DeploymentTester;
 import com.yahoo.vespa.hosted.controller.versions.VespaVersion;
 import org.junit.Test;
@@ -21,7 +20,6 @@ import java.time.Duration;
 import java.time.Instant;
 
 import static com.yahoo.vespa.hosted.controller.application.DeploymentJobs.JobType.component;
-import static com.yahoo.vespa.hosted.controller.application.DeploymentJobs.JobType.productionEuWest1;
 import static com.yahoo.vespa.hosted.controller.application.DeploymentJobs.JobType.productionUsEast3;
 import static com.yahoo.vespa.hosted.controller.application.DeploymentJobs.JobType.productionUsWest1;
 import static com.yahoo.vespa.hosted.controller.application.DeploymentJobs.JobType.stagingTest;
@@ -869,13 +867,13 @@ public class UpgraderTest {
         tester.readyJobTrigger().maintain();
         assertEquals(2, tester.deploymentQueue().jobs().size());
         tester.completeUpgrade(default0, version, "default");
-        tester.completeUpgrade(default2, version, "default");
+        tester.completeUpgrade(default1, version, "default");
 
         // Remaining applications upgraded
         upgrader.maintain();
         tester.readyJobTrigger().maintain();
         assertEquals(2, tester.deploymentQueue().jobs().size());
-        tester.completeUpgrade(default1, version, "default");
+        tester.completeUpgrade(default2, version, "default");
         tester.completeUpgrade(default3, version, "default");
         upgrader.maintain();
         tester.readyJobTrigger().maintain();