Merge pull request #664 from jenkinsci/GH-628

Expose cancelBuildsOnUpdate to dsl
jenkinsci · Jun 9, 2018 · 4e86ed4 · 4e86ed4
2 parents b49fbc7 + 556164a
commit 4e86ed4
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/ghprb/jobdsl/GhprbCancelBuildsOnUpdateContext.java b/src/main/java/org/jenkinsci/plugins/ghprb/jobdsl/GhprbCancelBuildsOnUpdateContext.java
@@ -0,0 +1,18 @@
+package org.jenkinsci.plugins.ghprb.jobdsl;
+
+import javaposse.jobdsl.dsl.Context;
+
+class GhprbCancelBuildsOnUpdateContext implements Context {
+    private Boolean overrideGlobal;
+
+    public Boolean getOverrideGlobal() {
+        return overrideGlobal;
+    }
+
+    /**
+     * sets the overrideGlobal value
+     */
+    public void overrideGlobal(Boolean overrideGlobal) {
+        this.overrideGlobal = overrideGlobal;
+    }
+}
diff --git a/src/main/java/org/jenkinsci/plugins/ghprb/jobdsl/GhprbExtensionContext.java b/src/main/java/org/jenkinsci/plugins/ghprb/jobdsl/GhprbExtensionContext.java
@@ -3,6 +3,7 @@
 import javaposse.jobdsl.dsl.Context;
 import javaposse.jobdsl.plugin.ContextExtensionPoint;
 import org.jenkinsci.plugins.ghprb.extensions.GhprbExtension;
+import org.jenkinsci.plugins.ghprb.extensions.build.GhprbCancelBuildsOnUpdate;
 import org.jenkinsci.plugins.ghprb.extensions.comments.GhprbBuildStatus;
 import org.jenkinsci.plugins.ghprb.extensions.status.GhprbSimpleStatus;
 
@@ -40,6 +41,16 @@ void buildStatus(Runnable closure) {
         extensions.add(new GhprbBuildStatus(context.getCompletedStatus()));
     }
 
+    /**
+     * Overrides global settings for cancelling builds when a PR was updated
+     */
+    void cancelBuildsOnUpdate(Runnable closure) {
+        GhprbCancelBuildsOnUpdateContext context = new GhprbCancelBuildsOnUpdateContext();
+        ContextExtensionPoint.executeInContext(closure, context);
+
+        extensions.add(new GhprbCancelBuildsOnUpdate(context.getOverrideGlobal()));
+    }
+
     public List<GhprbExtension> getExtensions() {
         return extensions;
     }