Add source revision to job report

5 files changed, 21 insertions, 2 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentJobs.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentJobs.java
index 1d04106d7bb..a728786e2ce 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentJobs.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentJobs.java
@@ -7,9 +7,9 @@ import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.RegionName;
 import com.yahoo.config.provision.SystemName;
-import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId;
 import com.yahoo.vespa.hosted.controller.Controller;
 import com.yahoo.vespa.hosted.controller.api.integration.organization.IssueId;
+import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId;
 
 import java.time.Instant;
 import java.util.Collection;
@@ -244,18 +244,21 @@ public class DeploymentJobs {
         private final JobType jobType;
         private final long projectId;
         private final long buildNumber;
+        private final Optional<SourceRevision> sourceRevision;
         private final Optional<JobError> jobError;
 
         public JobReport(ApplicationId applicationId, JobType jobType, long projectId, long buildNumber,
-                         Optional<JobError> jobError) {
+                         Optional<SourceRevision> sourceRevision, Optional<JobError> jobError) {
             Objects.requireNonNull(applicationId, "applicationId cannot be null");
             Objects.requireNonNull(jobType, "jobType cannot be null");
+            Objects.requireNonNull(sourceRevision, "sourceRevision cannot be null");
             Objects.requireNonNull(jobError, "jobError cannot be null");
 
             this.applicationId = applicationId;
             this.projectId = projectId;
             this.buildNumber = buildNumber;
             this.jobType = jobType;
+            this.sourceRevision = sourceRevision; // TODO: Require non-empty source revision if jobType == component
             this.jobError = jobError;
         }
 
@@ -264,6 +267,7 @@ public class DeploymentJobs {
         public long projectId() { return projectId; }
         public long buildNumber() { return buildNumber; }
         public boolean success() { return ! jobError.isPresent(); }
+        public Optional<SourceRevision> sourceRevision() { return sourceRevision; }
         public Optional<JobError> jobError() { return jobError; }
 
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiHandler.java
index 17181950a29..44f3197643a 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiHandler.java
@@ -16,6 +16,7 @@ import com.yahoo.vespa.hosted.controller.api.integration.BuildService.BuildJob;
 import com.yahoo.vespa.hosted.controller.application.DeploymentJobs.JobError;
 import com.yahoo.vespa.hosted.controller.application.DeploymentJobs.JobReport;
 import com.yahoo.vespa.hosted.controller.application.DeploymentJobs.JobType;
+import com.yahoo.vespa.hosted.controller.application.SourceRevision;
 import com.yahoo.vespa.hosted.controller.restapi.ErrorResponse;
 import com.yahoo.vespa.hosted.controller.restapi.Path;
 import com.yahoo.vespa.hosted.controller.restapi.SlimeJsonResponse;
@@ -173,10 +174,21 @@ public class ScrewdriverApiHandler extends LoggingRequestHandler {
                 JobType.fromJobName(report.field("jobName").asString()),
                 report.field("projectId").asLong(),
                 report.field("buildNumber").asLong(),
+                toSourceRevision(report.field("sourceRevision")),
                 jobError
         );
     }
 
+    private static Optional<SourceRevision> toSourceRevision(Inspector object) {
+        if (!object.field("repository").valid() ||
+            !object.field("branch").valid() ||
+            !object.field("commit").valid()) {
+            return Optional.empty();
+        }
+        return Optional.of(new SourceRevision(object.field("repository").asString(), object.field("branch").asString(),
+                                              object.field("commit").asString()));
+    }
+
     private static String asString(InputStream in) {
         Scanner scanner = new Scanner(in).useDelimiter("\\A");
         if (scanner.hasNext()) {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java
index de8b6b9cd18..c9f0c6cba1d 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java
@@ -163,6 +163,7 @@ public class DeploymentTester {
                 jobType,
                 application.deploymentJobs().projectId().get(),
                 42,
+                Optional.empty(),
                 jobError
         );
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/MockBuildService.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/MockBuildService.java
index 1b1a4feaa4e..b7da2af263c 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/MockBuildService.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/MockBuildService.java
@@ -162,6 +162,7 @@ public class MockBuildService implements BuildService {
                                 jobType,
                                 projectId,
                                 42,
+                                Optional.empty(),
                                 Optional.ofNullable(success ? null : JobError.unknown)
                         ));
         }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerControllerTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerControllerTester.java
index f252acd44ca..4748304cc35 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerControllerTester.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerControllerTester.java
@@ -95,6 +95,7 @@ public class ContainerControllerTester {
         }
         controller().applications().notifyJobCompletion(new DeploymentJobs.JobReport(applicationId, job, projectId,
                                                                                      42,
+                                                                                     Optional.empty(),
                                                                                      success ? Optional.empty() : Optional.of(DeploymentJobs.JobError.unknown)
         ));
     }