1 files changed, 10 insertions, 1 deletions
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 56f84189092..4d4f01bc1a6 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
@@ -59,6 +59,7 @@ public class ScrewdriverApiHandler extends LoggingRequestHandler {
             switch (method) {
                 case GET: return get(request);
                 case POST: return post(request);
+                case DELETE: return delete(request);
                 default: return ErrorResponse.methodNotAllowed("Method '" + method + "' is unsupported");
             }
         } catch (IllegalArgumentException|IllegalStateException e) {
@@ -75,7 +76,7 @@ public class ScrewdriverApiHandler extends LoggingRequestHandler {
             return vespaVersion();
         }
         if (path.matches("/screwdriver/v1/jobsToRun")) {
-            return buildJobs(controller.applications().deploymentTrigger().deploymentQueue().jobs());
+            return buildJobs(controller.applications().deploymentTrigger().buildSystem().jobs());
         }
         return notFound(request);
     }
@@ -91,6 +92,14 @@ public class ScrewdriverApiHandler extends LoggingRequestHandler {
         return notFound(request);
     }
 
+    private HttpResponse delete(HttpRequest request) {
+        Path path = new Path(request.getUri().getPath());
+        if (path.matches("/screwdriver/v1/jobsToRun")) {
+            return buildJobs(controller.applications().deploymentTrigger().buildSystem().takeJobsToRun());
+        }
+        return notFound(request);
+    }
+
     private HttpResponse trigger(HttpRequest request, String tenantName, String applicationName) {
         JobType jobType = Optional.of(asString(request.getData()))
                 .filter(s -> !s.isEmpty())