Avoid deploying revisoins for apps without project id (no orch CD hack)

2 files changed, 3 insertions, 1 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
index 607a23e13bd..7827daad99a 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
@@ -536,7 +536,8 @@ public class JobController {
             });
 
             applications.storeWithUpdatedConfig(application, submission.applicationPackage());
-            applications.deploymentTrigger().triggerNewRevision(id);
+            if (application.get().projectId().isPresent())
+                applications.deploymentTrigger().triggerNewRevision(id);
         });
         return version.get();
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OutstandingChangeDeployer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OutstandingChangeDeployer.java
index db9dc51ffa9..8a14dd3a146 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OutstandingChangeDeployer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OutstandingChangeDeployer.java
@@ -22,6 +22,7 @@ public class OutstandingChangeDeployer extends ControllerMaintainer {
     protected double maintain() {
         for (Application application : ApplicationList.from(controller().applications().readable())
                                                       .withProductionDeployment()
+                                                      .withProjectId()
                                                       .withDeploymentSpec()
                                                       .asList())
             controller().applications().deploymentTrigger().triggerNewRevision(application.id());