Assert that zone-application is deployed

2 files changed, 10 insertions, 7 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 db749713483..8b0dc35e16b 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
@@ -341,16 +341,16 @@ public class ApplicationController {
 
     /** Deploy a system application to given zone */
     public void deploy(SystemApplication application, ZoneId zone, Version version) {
-        if (!application.hasApplicationPackage()) {
+        if (application.hasApplicationPackage()) {
+            ApplicationPackage applicationPackage = new ApplicationPackage(
+                    artifactRepository.getSystemApplicationPackage(application.id(), zone, version)
+            );
+            DeployOptions options = withVersion(version, DeployOptions.none());
+            deploy(application.id(), applicationPackage, zone, options, Collections.emptySet(), Collections.emptySet());
+        } else {
             // Deploy by calling node repository directly
             configServer().nodeRepository().upgrade(zone, application.nodeType(), version);
-            return;
         }
-        ApplicationPackage applicationPackage = new ApplicationPackage(
-                artifactRepository.getSystemApplicationPackage(application.id(), zone, version)
-        );
-        DeployOptions options = withVersion(version, DeployOptions.none());
-        deploy(application.id(), applicationPackage, zone, options, Collections.emptySet(), Collections.emptySet());
     }
 
     private ActivateResult deploy(ApplicationId application, ApplicationPackage applicationPackage,
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java
index 54e9ace1142..22a3ed0445f 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java
@@ -16,6 +16,7 @@ import java.util.List;
 import java.util.function.Function;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author mpolden
@@ -70,6 +71,8 @@ public class SystemUpgraderTest {
         tester.systemUpgrader().maintain();
         assertWantedVersion(SystemApplication.zone, version2, zone1);
         completeUpgrade(SystemApplication.zone, version2, zone1);
+        assertTrue("Deployed zone application",
+                   tester.configServer().application(SystemApplication.zone.id()).isPresent());
 
         // zone 2, 3 and 4: still targets old version
         assertWantedVersion(SystemApplication.configServer, version1, zone2, zone3, zone4);