aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2019-09-20 12:28:28 +0200
committerJon Marius Venstad <venstad@gmail.com>2019-09-28 19:21:57 +0200
commitb904343522abd03033578f566e1b59c666ab8617 (patch)
tree81a71610a4b75a202b79c903df208bd810143287 /controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java
parent8e7e5736d4fe6f80850acad6565899e521fc40c0 (diff)
ProjectId and change management only in Application
Diffstat (limited to 'controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java6
1 files changed, 3 insertions, 3 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 a6fce4bb0c4..8374e976901 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
@@ -130,10 +130,10 @@ public class LockedApplication {
rotations, rotationStatus);
}
- public LockedApplication withJobCompletion(long projectId, JobType jobType, JobStatus.JobRun completion,
- Optional<DeploymentJobs.JobError> jobError) {
+ public LockedApplication withJobCompletion(long projectId, JobType jobType) {
return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, deployments,
- deploymentJobs.withCompletion(projectId, jobType, completion, jobError),
+ deploymentJobs.withProjectId(jobType == JobType.component ? OptionalLong.of(projectId)
+ : deploymentJobs.projectId()),
change, outstandingChange, ownershipIssueId, owner, majorVersion, metrics,
pemDeployKey, rotations, rotationStatus);
}