All applications are now deployed on internal pipeline

1 files changed, 19 insertions, 27 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java
index 46d1d436521..fa81a990c70 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java
@@ -45,7 +45,6 @@ public class LockedApplication {
     private final ApplicationMetrics metrics;
     private final Set<PublicKey> deployKeys;
     private final OptionalLong projectId;
-    private final boolean internal;
     private final Optional<ApplicationVersion> latestVersion;
     private final Map<InstanceName, Instance> instances;
 
@@ -60,14 +59,14 @@ public class LockedApplication {
              application.deploymentSpec(), application.validationOverrides(), application.change(),
              application.outstandingChange(), application.deploymentIssueId(), application.ownershipIssueId(),
              application.owner(), application.majorVersion(), application.metrics(), application.deployKeys(),
-             application.projectId(), application.internal(), application.latestVersion(), application.instances());
+             application.projectId(), application.latestVersion(), application.instances());
     }
 
     private LockedApplication(Lock lock, TenantAndApplicationId id, Instant createdAt, DeploymentSpec deploymentSpec,
                               ValidationOverrides validationOverrides, Change change, Change outstandingChange,
                               Optional<IssueId> deploymentIssueId, Optional<IssueId> ownershipIssueId, Optional<User> owner,
                               OptionalInt majorVersion, ApplicationMetrics metrics, Set<PublicKey> deployKeys,
-                              OptionalLong projectId, boolean internal, Optional<ApplicationVersion> latestVersion,
+                              OptionalLong projectId, Optional<ApplicationVersion> latestVersion,
                               Map<InstanceName, Instance> instances) {
         this.lock = lock;
         this.id = id;
@@ -83,7 +82,6 @@ public class LockedApplication {
         this.metrics = metrics;
         this.deployKeys = deployKeys;
         this.projectId = projectId;
-        this.internal = internal;
         this.latestVersion = latestVersion;
         this.instances = Map.copyOf(instances);
     }
@@ -92,7 +90,7 @@ public class LockedApplication {
     public Application get() {
         return new Application(id, createdAt, deploymentSpec, validationOverrides, change, outstandingChange,
                                deploymentIssueId, ownershipIssueId, owner, majorVersion, metrics, deployKeys,
-                               projectId, internal, latestVersion, instances.values());
+                               projectId, latestVersion, instances.values());
     }
 
     public LockedApplication withNewInstance(InstanceName instance) {
@@ -100,7 +98,7 @@ public class LockedApplication {
         instances.put(instance, new Instance(id.instance(instance)));
         return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, change, outstandingChange,
                                      deploymentIssueId, ownershipIssueId, owner, majorVersion, metrics, deployKeys,
-                                     projectId, internal, latestVersion, instances);
+                                     projectId, latestVersion, instances);
     }
 
     public LockedApplication with(InstanceName instance, UnaryOperator<Instance> modification) {
@@ -108,7 +106,7 @@ public class LockedApplication {
         instances.put(instance, modification.apply(instances.get(instance)));
         return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, change, outstandingChange,
                                      deploymentIssueId, ownershipIssueId, owner, majorVersion, metrics, deployKeys,
-                                     projectId, internal, latestVersion, instances);
+                                     projectId, latestVersion, instances);
     }
 
     public LockedApplication without(InstanceName instance) {
@@ -116,67 +114,61 @@ public class LockedApplication {
         instances.remove(instance);
         return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, change, outstandingChange,
                                      deploymentIssueId, ownershipIssueId, owner, majorVersion, metrics, deployKeys,
-                                     projectId, internal, latestVersion, instances);
+                                     projectId, latestVersion, instances);
     }
 
     public LockedApplication withNewSubmission(ApplicationVersion latestVersion) {
         return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, change, outstandingChange,
                                      deploymentIssueId, ownershipIssueId, owner, majorVersion, metrics, deployKeys,
-                                     projectId, internal, Optional.of(latestVersion), instances);
-    }
-
-    public LockedApplication withBuiltInternally(boolean builtInternally) {
-        return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, change, outstandingChange,
-                                     deploymentIssueId, ownershipIssueId, owner, majorVersion, metrics, deployKeys,
-                                     projectId, builtInternally, latestVersion, instances);
+                                     projectId, Optional.of(latestVersion), instances);
     }
 
     public LockedApplication withProjectId(OptionalLong projectId) {
         return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, change, outstandingChange,
                                      deploymentIssueId, ownershipIssueId, owner, majorVersion, metrics, deployKeys,
-                                     projectId, internal, latestVersion, instances);
+                                     projectId, latestVersion, instances);
     }
 
     public LockedApplication withDeploymentIssueId(IssueId issueId) {
         return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, change, outstandingChange,
                                      Optional.ofNullable(issueId), ownershipIssueId, owner, majorVersion, metrics, deployKeys,
-                                     projectId, internal, latestVersion, instances);
+                                     projectId, latestVersion, instances);
     }
 
     public LockedApplication with(DeploymentSpec deploymentSpec) {
         return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, change, outstandingChange,
                                      deploymentIssueId, ownershipIssueId, owner, majorVersion, metrics, deployKeys,
-                                     projectId, internal, latestVersion, instances);
+                                     projectId, latestVersion, instances);
     }
 
     public LockedApplication with(ValidationOverrides validationOverrides) {
         return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, change, outstandingChange,
                                      deploymentIssueId, ownershipIssueId, owner, majorVersion, metrics, deployKeys,
-                                     projectId, internal, latestVersion, instances);
+                                     projectId, latestVersion, instances);
     }
 
     public LockedApplication withChange(Change change) {
         return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, change, outstandingChange,
                                      deploymentIssueId, ownershipIssueId, owner, majorVersion, metrics, deployKeys,
-                                     projectId, internal, latestVersion, instances);
+                                     projectId, latestVersion, instances);
     }
 
     public LockedApplication withOutstandingChange(Change outstandingChange) {
         return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, change, outstandingChange,
                                      deploymentIssueId, ownershipIssueId, owner, majorVersion, metrics, deployKeys,
-                                     projectId, internal, latestVersion, instances);
+                                     projectId, latestVersion, instances);
     }
 
     public LockedApplication withOwnershipIssueId(IssueId issueId) {
         return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, change, outstandingChange,
                                      deploymentIssueId, Optional.of(issueId), owner, majorVersion, metrics, deployKeys,
-                                     projectId, internal, latestVersion, instances);
+                                     projectId, latestVersion, instances);
     }
 
     public LockedApplication withOwner(User owner) {
         return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, change, outstandingChange,
                                      deploymentIssueId, ownershipIssueId, Optional.of(owner), majorVersion, metrics, deployKeys,
-                                     projectId, internal, latestVersion, instances);
+                                     projectId, latestVersion, instances);
     }
 
     /** Set a major version for this, or set to null to remove any major version override */
@@ -184,13 +176,13 @@ public class LockedApplication {
         return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, change, outstandingChange,
                                      deploymentIssueId, ownershipIssueId, owner,
                                      majorVersion == null ? OptionalInt.empty() : OptionalInt.of(majorVersion),
-                                     metrics, deployKeys, projectId, internal, latestVersion, instances);
+                                     metrics, deployKeys, projectId, latestVersion, instances);
     }
 
     public LockedApplication with(ApplicationMetrics metrics) {
         return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, change, outstandingChange,
                                      deploymentIssueId, ownershipIssueId, owner, majorVersion, metrics, deployKeys,
-                                     projectId, internal, latestVersion, instances);
+                                     projectId, latestVersion, instances);
     }
 
     public LockedApplication withDeployKey(PublicKey pemDeployKey) {
@@ -198,7 +190,7 @@ public class LockedApplication {
         keys.add(pemDeployKey);
         return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, change, outstandingChange,
                                      deploymentIssueId, ownershipIssueId, owner, majorVersion, metrics, keys,
-                                     projectId, internal, latestVersion, instances);
+                                     projectId, latestVersion, instances);
     }
 
     public LockedApplication withoutDeployKey(PublicKey pemDeployKey) {
@@ -206,7 +198,7 @@ public class LockedApplication {
         keys.remove(pemDeployKey);
         return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, change, outstandingChange,
                                      deploymentIssueId, ownershipIssueId, owner, majorVersion, metrics, keys,
-                                     projectId, internal, latestVersion, instances);
+                                     projectId, latestVersion, instances);
     }
 
     @Override