Remove self-triggering support

15 files changed, 35 insertions, 105 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 3f8a6e984d8..2ce2e480fc5 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
@@ -305,7 +305,6 @@ public class ApplicationController {
                     application = application.withDeploying(Optional.of(Change.ApplicationChange.of(revision)));
                 if ( ! triggeredWith(revision, application, jobType) && !canDeployDirectlyTo(zone, options) && jobType != null) {
                     // Triggering information is used to store which changes were made or attempted
-                    // - For self-triggered applications we don't have any trigger information, so we add it here.
                     // - For all applications, we don't have complete control over which revision is actually built,
                     //   so we update it here with what we actually triggered if necessary
                     application = application.with(application.deploymentJobs()
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 b4ca00243b7..af8617cbf05 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
@@ -31,25 +31,23 @@ public class DeploymentJobs {
     private final Optional<Long> projectId;
     private final ImmutableMap<JobType, JobStatus> status;
     private final Optional<String> jiraIssueId;
-    private final boolean selfTriggering; // TODO: Remove this when no projects are self-triggering.
 
     /** Creates an empty set of deployment jobs */
     public DeploymentJobs(long projectId) {
-        this(Optional.of(projectId), ImmutableMap.of(), Optional.empty(),true);
+        this(Optional.of(projectId), ImmutableMap.of(), Optional.empty());
     }
     
-    public DeploymentJobs(Optional<Long> projectId, Collection<JobStatus> jobStatusEntries, Optional<String> jiraIssueId, boolean selfTriggering) {
-        this(projectId, asMap(jobStatusEntries), jiraIssueId, selfTriggering);
+    public DeploymentJobs(Optional<Long> projectId, Collection<JobStatus> jobStatusEntries, Optional<String> jiraIssueId) {
+        this(projectId, asMap(jobStatusEntries), jiraIssueId);
     }
     
-    private DeploymentJobs(Optional<Long> projectId, Map<JobType, JobStatus> status, Optional<String> jiraIssueId, boolean selfTriggering) {
+    private DeploymentJobs(Optional<Long> projectId, Map<JobType, JobStatus> status, Optional<String> jiraIssueId) {
         Objects.requireNonNull(projectId, "projectId cannot be null");
         Objects.requireNonNull(status, "status cannot be null");
         Objects.requireNonNull(jiraIssueId, "jiraIssueId cannot be null");
         this.projectId = projectId;
         this.status = ImmutableMap.copyOf(status);
         this.jiraIssueId = jiraIssueId;
-        this.selfTriggering = selfTriggering;
     }
     
     private static Map<JobType, JobStatus> asMap(Collection<JobStatus> jobStatusEntries) {
@@ -66,7 +64,7 @@ public class DeploymentJobs {
             if (job == null) job = JobStatus.initial(report.jobType());
             return job.withCompletion(report.jobError(), notificationTime, controller);
         });
-        return new DeploymentJobs(Optional.of(report.projectId()), status, jiraIssueId, report.selfTriggering());
+        return new DeploymentJobs(Optional.of(report.projectId()), status, jiraIssueId);
     }
 
     public DeploymentJobs withTriggering(JobType jobType,
@@ -81,33 +79,26 @@ public class DeploymentJobs {
                                       change.isPresent() && change.get() instanceof Change.VersionChange,
                                       triggerTime);
         });
-        return new DeploymentJobs(projectId, status, jiraIssueId, selfTriggering);
+        return new DeploymentJobs(projectId, status, jiraIssueId);
     }
 
     public DeploymentJobs withProjectId(long projectId) {
-        return new DeploymentJobs(Optional.of(projectId), status, jiraIssueId, selfTriggering);
+        return new DeploymentJobs(Optional.of(projectId), status, jiraIssueId);
     }
 
     public DeploymentJobs withJiraIssueId(Optional<String> jiraIssueId) {
-        return new DeploymentJobs(projectId, status, jiraIssueId, selfTriggering);
+        return new DeploymentJobs(projectId, status, jiraIssueId);
     }
 
     public DeploymentJobs without(JobType job) {
         Map<JobType, JobStatus> status = new HashMap<>(this.status);
         status.remove(job);
-        return new DeploymentJobs(projectId, status, jiraIssueId, selfTriggering);
-    }
-    
-    public DeploymentJobs asSelfTriggering(boolean selfTriggering) {
-        return new DeploymentJobs(projectId, status, jiraIssueId, selfTriggering);
+        return new DeploymentJobs(projectId, status, jiraIssueId);
     }
 
     /** Returns an immutable map of the status entries in this */
     public Map<JobType, JobStatus> jobStatus() { return status; }
 
-    /** Returns whether this application's deployment jobs trigger each other, and should be left alone, or not. */
-    public boolean isSelfTriggering() { return selfTriggering; }
-
     /** Returns whether this has some job status which is not a success */
     public boolean hasFailures() {
         return status.values().stream().anyMatch(jobStatus -> ! jobStatus.isSuccess());
@@ -281,19 +272,18 @@ public class DeploymentJobs {
         private final long projectId;
         private final long buildNumber;
         private final Optional<JobError> jobError;
-        private final boolean selfTriggering;
 
         public JobReport(ApplicationId applicationId, JobType jobType, long projectId, long buildNumber,
-                         Optional<JobError> jobError, boolean selfTriggering) {
+                         Optional<JobError> jobError) {
             Objects.requireNonNull(applicationId, "applicationId cannot be null");
             Objects.requireNonNull(jobType, "jobType cannot be null");
             Objects.requireNonNull(jobError, "jobError cannot be null");
+
             this.applicationId = applicationId;
             this.projectId = projectId;
             this.buildNumber = buildNumber;
             this.jobType = jobType;
             this.jobError = jobError;
-            this.selfTriggering = selfTriggering;
         }
 
         public ApplicationId applicationId() { return applicationId; }
@@ -302,7 +292,6 @@ public class DeploymentJobs {
         public long buildNumber() { return buildNumber; }
         public boolean success() { return !jobError.isPresent(); }
         public Optional<JobError> jobError() { return jobError; }
-        public boolean selfTriggering() { return selfTriggering; }
 
     }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
index 8826ee5bf67..46f11ef208c 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
@@ -280,11 +280,6 @@ public class DeploymentTrigger {
             return application;
         }
 
-        if (application.deploymentJobs().isSelfTriggering()) {
-            log.info("Not triggering " + jobType + " for self-triggering " + application);
-            return application;
-        }
-
         // Ignore applications that are not associated with a project
         if (!application.deploymentJobs().projectId().isPresent()) {
             return application;
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java
index 607ad4fd9f0..14fce0987b7 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java
@@ -61,7 +61,6 @@ public class ApplicationSerializer {
     private final String projectIdField = "projectId";
     private final String jobStatusField = "jobStatus";
     private final String jiraIssueIdField = "jiraIssueId";
-    private final String selfTriggeringField = "selfTriggering";
     
     // JobStatus field
     private final String jobTypeField = "jobType";
@@ -125,7 +124,6 @@ public class ApplicationSerializer {
         deploymentJobs.projectId().ifPresent(projectId -> cursor.setLong(projectIdField, projectId));
         jobStatusToSlime(deploymentJobs.jobStatus().values(), cursor.setArray(jobStatusField));
         deploymentJobs.jiraIssueId().ifPresent(jiraIssueId -> cursor.setString(jiraIssueIdField, jiraIssueId));
-        cursor.setBool(selfTriggeringField, deploymentJobs.isSelfTriggering());
     }
 
     private void jobStatusToSlime(Collection<JobStatus> jobStatuses, Cursor jobStatusArray) {
@@ -218,9 +216,8 @@ public class ApplicationSerializer {
         Optional<Long> projectId = optionalLong(object.field(projectIdField));
         List<JobStatus> jobStatusList = jobStatusListFromSlime(object.field(jobStatusField));
         Optional<String> jiraIssueKey = optionalString(object.field(jiraIssueIdField));
-        boolean selfTriggering = object.field(selfTriggeringField).asBool();
 
-        return new DeploymentJobs(projectId, jobStatusList, jiraIssueKey, selfTriggering);
+        return new DeploymentJobs(projectId, jobStatusList, jiraIssueKey);
     }
 
     private Optional<Change> changeFromSlime(Inspector object) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index 9d6aa7d3632..7c335ff3498 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -687,9 +687,6 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
                                                    "Version is not active in this system. " +
                                                    "Active versions: " + controller.versionStatus().versions());
 
-            // Since we manually triggered it we don't want this to be self-triggering for the time being 
-            controller.applications().store(application.with(application.deploymentJobs().asSelfTriggering(false)), lock);
-
             controller.applications().deploymentTrigger().triggerChange(application.id(), new Change.VersionChange(version));
             return new MessageResponse("Triggered deployment of " + application + " on version " + version);
         }
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 3cc4d8c7f5c..a02bb6b373e 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
@@ -103,23 +103,6 @@ public class ScrewdriverApiHandler extends LoggingRequestHandler {
         return new SlimeJsonResponse(slime);
     }
 
-    /**
-     * Parse a JSON blob of the form:
-     * {
-     *     "tenant"        :   String
-     *     "application"   :   String
-     *     "instance"      :   String
-     *     "jobName"       :   String
-     *     "projectId"     :   long
-     *     "success"       :   boolean
-     *     "selfTriggering":   boolean
-     *     "vespaVersion"  :   String
-     * }
-     * and notify the controller of the report.
-     *
-     * @param request The JSON blob.
-     * @return 200
-     */
     private HttpResponse handleJobReportPost(HttpRequest request) {
         controller.applications().notifyJobCompletion(toJobReport(toSlime(request.getData()).get()));
         return new StringResponse("ok");
@@ -147,8 +130,7 @@ public class ScrewdriverApiHandler extends LoggingRequestHandler {
                 JobType.fromId(report.field("jobName").asString()),
                 report.field("projectId").asLong(),
                 report.field("buildNumber").asLong(),
-                jobError,
-                report.field("selfTriggering").asBool()
+                jobError
         );
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
index 61cc84a07ba..36b09708399 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
@@ -95,7 +95,7 @@ public class ControllerTest {
         // staging job - succeeding
         Version version1 = Version.fromString("6.1"); // Set in config server mock
         Application app1 = tester.createApplication("app1", "tenant1", 1, 11L);
-        applications.notifyJobCompletion(mockReport(app1, component, true, false));
+        applications.notifyJobCompletion(mockReport(app1, component, true));
         assertFalse("Revision is currently not known",
                     ((Change.ApplicationChange)tester.controller().applications().require(app1.id()).deploying().get()).revision().isPresent());
         tester.deployAndNotify(app1, applicationPackage, true, systemTest);
@@ -137,7 +137,7 @@ public class ControllerTest {
         tester.clock().advance(Duration.ofSeconds(1));
 
         // system and staging test job - succeeding
-        applications.notifyJobCompletion(mockReport(app1, component, true, false));
+        applications.notifyJobCompletion(mockReport(app1, component, true));
         tester.deployAndNotify(app1, applicationPackage, true, systemTest);
         assertStatus(JobStatus.initial(systemTest)
                               .withTriggering(version1, revision, false, tester.clock().instant())
@@ -164,7 +164,7 @@ public class ControllerTest {
                 .environment(Environment.prod)
                 .region("us-east-3")
                 .build();
-        applications.notifyJobCompletion(mockReport(app1, component, true, false));
+        applications.notifyJobCompletion(mockReport(app1, component, true));
         try {
             tester.deploy(systemTest, app1, applicationPackage);
             fail("Expected exception due to unallowed production deployment removal");
@@ -201,10 +201,9 @@ public class ControllerTest {
         Version systemVersion = tester.controller().versionStatus().systemVersion().get().versionNumber();
 
         Application app1 = tester.createApplication("application1", "tenant1", 1, 1L);
-        applications.store(app1.with(app1.deploymentJobs().asSelfTriggering(false)), applications.lock(app1.id()));
 
         // First deployment: An application change
-        applications.notifyJobCompletion(mockReport(app1, component, true, false));
+        applications.notifyJobCompletion(mockReport(app1, component, true));
         tester.deployAndNotify(app1, applicationPackage, true, systemTest);
         tester.deployAndNotify(app1, applicationPackage, true, stagingTest);
         tester.deployAndNotify(app1, applicationPackage, true, productionUsWest1);
@@ -227,7 +226,7 @@ public class ControllerTest {
                 .region("us-west-1")
                 .region("us-east-3")
                 .build();
-        applications.notifyJobCompletion(mockReport(app1, component, true, false));
+        applications.notifyJobCompletion(mockReport(app1, component, true));
         tester.deployAndNotify(app1, applicationPackage, true, systemTest);
         tester.deployAndNotify(app1, applicationPackage, true, stagingTest);
         tester.deployAndNotify(app1, applicationPackage, true, productionUsWest1);
@@ -398,23 +397,6 @@ public class ControllerTest {
     }
 
     @Test
-    public void selfTriggeringApplicationIsNotTriggered() {
-        ControllerTester tester = new ControllerTester();
-        ApplicationController applications = tester.controller().applications();
-
-        // Create application and report completion from component job
-        long projectId = 1;
-        TenantId tenant = tester.createTenant("tenant", "domain", 1L);
-        Application application = tester.createApplication(tenant, "application", "default", projectId);
-        applications.notifyJobCompletion(mockReport(application, component, true, true));
-
-        // Only component completion status is persisted and no further jobs are triggered
-        assertEquals(1, applications.get(application.id()).get().deploymentJobs().jobStatus().size());
-        assertStatus(JobStatus.initial(component).withCompletion(Optional.empty(), tester.clock().instant(), tester.controller()),
-                     application.id(), tester.controller());
-    }
-
-    @Test
     public void requeueOutOfCapacityStagingJob() {
         DeploymentTester tester = new DeploymentTester();
 
@@ -485,19 +467,18 @@ public class ControllerTest {
         assertEquals(expectedStatus, existingStatus);
     }
 
-    private JobReport mockReport(Application application, JobType jobType, Optional<JobError> jobError, boolean selfTriggering) {
+    private JobReport mockReport(Application application, JobType jobType, Optional<JobError> jobError) {
         return new JobReport(
                 application.id(),
                 jobType,
                 application.deploymentJobs().projectId().get(),
                 42,
-                jobError,
-                selfTriggering
+                jobError
         );
     }
 
-    private JobReport mockReport(Application application, JobType jobType, boolean success, boolean selfTriggering) {
-        return mockReport(application, jobType, JobError.from(success), selfTriggering);
+    private JobReport mockReport(Application application, JobType jobType, boolean success) {
+        return mockReport(application, jobType, JobError.from(success));
     }
 
     @Test
@@ -532,8 +513,7 @@ public class ControllerTest {
         ApplicationController applications = tester.controller().applications();TenantId tenant = tester.createTenant("tenant1", "domain1", 11L);
         Application app = tester.createApplication(tenant, "app1", "default", 1);
 
-        app = app.withDeploying(Optional.of(new Change.VersionChange(Version.fromString("6.3"))))
-                .with(app.deploymentJobs().asSelfTriggering(false));
+        app = app.withDeploying(Optional.of(new Change.VersionChange(Version.fromString("6.3"))));
         applications.store(app, applications.lock(app.id()));
         try {
             tester.deploy(app, new Zone(Environment.prod, RegionName.from("us-east-3")));
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 44309b43a5f..fb8b9df40ba 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
@@ -214,8 +214,7 @@ public class DeploymentTester {
                 jobType,
                 application.deploymentJobs().projectId().get(),
                 42,
-                jobError,
-                false
+                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 b9e66b354de..0293ea08d65 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
@@ -161,8 +161,7 @@ public class MockBuildService implements BuildService {
                                 jobType,
                                 projectId,
                                 42,
-                                JobError.from(success),
-                                false
+                                JobError.from(success)
                         ));
         }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/testdata/application-without-project-id.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/testdata/application-without-project-id.json
index 912d1c2f4dc..63832531c7d 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/testdata/application-without-project-id.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/testdata/application-without-project-id.json
@@ -13,8 +13,7 @@
           "at": 1506330088050
         }
       }
-    ],
-    "selfTriggering": false
+    ]
   },
   "outstandingChangeField": false
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/testdata/canary-with-stale-data.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/testdata/canary-with-stale-data.json
index 323889c7c45..9864ce502f6 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/testdata/canary-with-stale-data.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/testdata/canary-with-stale-data.json
@@ -288,8 +288,7 @@
           "at": 1493033800469
         }
       }
-    ],
-    "selfTriggering": false
+    ]
   },
   "outstandingChangeField": false
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java
index 1aaf41350f2..f0a2019d41e 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java
@@ -67,7 +67,7 @@ public class ApplicationSerializerTest {
                                 .withTriggering(Version.fromString("5.6.6"), Optional.empty(), true, Instant.ofEpochMilli(5))
                                 .withCompletion(Optional.of(JobError.unknown), Instant.ofEpochMilli(6), tester.controller()));
 
-        DeploymentJobs deploymentJobs = new DeploymentJobs(projectId, statusList, Optional.empty(), false);
+        DeploymentJobs deploymentJobs = new DeploymentJobs(projectId, statusList, Optional.empty());
 
         Application original = new Application(ApplicationId.from("t1", "a1", "i1"), 
                                                deploymentSpec, 
@@ -98,7 +98,6 @@ public class ApplicationSerializerTest {
         assertEquals(  original.deploymentJobs().jobStatus().get(DeploymentJobs.JobType.stagingTest),
                      serialized.deploymentJobs().jobStatus().get(DeploymentJobs.JobType.stagingTest));
         assertEquals(original.deploymentJobs().failingSince(), serialized.deploymentJobs().failingSince());
-        assertEquals(original.deploymentJobs().isSelfTriggering(), serialized.deploymentJobs().isSelfTriggering());
         
         assertEquals(original.hasOutstandingChange(), serialized.hasOutstandingChange());
         
@@ -167,8 +166,7 @@ public class ApplicationSerializerTest {
                 "          \"at\": 1505725189469\n" +
                 "        }\n" +
                 "      }\n" +
-                "    ],\n" +
-                "    \"selfTriggering\": false\n" +
+                "    ]\n" +
                 "  }\n" +
                 "}\n";
     }
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 ef606a0eced..ed7378ac6b5 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
@@ -89,8 +89,8 @@ public class ContainerControllerTester {
     public void notifyJobCompletion(ApplicationId applicationId, long projectId, boolean success, DeploymentJobs.JobType job) {
         controller().applications().notifyJobCompletion(new DeploymentJobs.JobReport(applicationId, job, projectId,
                                                                                      42,
-                                                                                     success ? Optional.empty() : Optional.of(DeploymentJobs.JobError.unknown),
-                                                                                     false));
+                                                                                     success ? Optional.empty() : Optional.of(DeploymentJobs.JobError.unknown)
+        ));
     }
 
     public AthensDomain addTenantAthensDomain(String domainName, String userName) {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiTest.java
index bdfd0f9794f..5425b37d787 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiTest.java
@@ -74,7 +74,7 @@ public class ScrewdriverApiTest extends ControllerContainerTest {
         // Notifying about unknown job fails
         tester.containerTester().assertResponse(new Request("http://localhost:8080/screwdriver/v1/jobreport",
                                                             jsonReport(app.id(), JobType.productionUsEast3, projectId, 1L,
-                                                                       Optional.empty(), false, true)
+                                                                       Optional.empty())
                                                                     .getBytes(StandardCharsets.UTF_8),
                                                             Request.Method.POST),
                                                 new File("unexpected-completion.json"), 400);
@@ -141,21 +141,19 @@ public class ScrewdriverApiTest extends ControllerContainerTest {
     
     private void notifyCompletion(ApplicationId app, long projectId, JobType jobType, Optional<JobError> error) throws IOException {
         assertResponse(new Request("http://localhost:8080/screwdriver/v1/jobreport",
-                                   jsonReport(app, jobType, projectId, 1L, error, false, true).getBytes(StandardCharsets.UTF_8),
+                                   jsonReport(app, jobType, projectId, 1L, error).getBytes(StandardCharsets.UTF_8),
                                    Request.Method.POST),
                        200, "ok");
     }
 
     private static String jsonReport(ApplicationId applicationId, JobType jobType, long projectId, long buildNumber,
-                                     Optional<JobError> jobError, boolean selfTriggering, boolean gitChanges) {
+                                     Optional<JobError> jobError) {
         return
                 "{\n" +
                         "    \"projectId\"     : "  + projectId + ",\n" +
                         "    \"jobName\"       :\"" + jobType.id() + "\",\n" +
                         "    \"buildNumber\"   : "  + buildNumber + ",\n" +
                         jobError.map(message -> "    \"jobError\"      : \""  + message + "\",\n").orElse("") +
-                        "    \"selfTriggering\": "  + selfTriggering + ",\n" +
-                        "    \"gitChanges\"    : "  + gitChanges + ",\n" +
                         "    \"tenant\"        :\"" + applicationId.tenant().value() + "\",\n" +
                         "    \"application\"   :\"" + applicationId.application().value() + "\",\n" +
                         "    \"instance\"      :\"" + applicationId.instance().value() + "\"\n" +
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
index c4a3bd9cd81..6071776edf5 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
@@ -274,8 +274,7 @@ public class VersionStatusTest {
                 jobType,
                 application.deploymentJobs().projectId().get(),
                 42,
-                JobError.from(success),
-                false
+                JobError.from(success)
         );
     }