From: David Galloway <dgallowa@redhat.com>
Date: Tue, 8 Aug 2017 16:21:47 +0000 (-0400)
Subject: Use new cancel-builds-on-update parameter
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=850b23f375be0a83a72f06ff0da9cfa6ab2ca43b;p=ceph-build.git

Use new cancel-builds-on-update parameter

Need to update/pin JJB to the beta >2.0.0 for now

Signed-off-by: David Galloway <dgallowa@redhat.com>
---

diff --git a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
index 50a962f9..7164d30e 100644
--- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
+++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
@@ -71,6 +71,7 @@
 
     triggers:
       - github-pull-request:
+          cancel-builds-on-update: true
           allow-whitelist-orgs-as-admins: true
           org-list:
             - ceph
@@ -106,11 +107,6 @@
             - ../../build/build
 
     publishers:
-      - raw:
-          xml: |
-            <org.jenkinsci.plugins.ghprb.extensions.build.GhprbCancelBuildsOnUpdate>
-              <overrideGlobal>false</overrideGlobal>
-            </org.jenkinsci.plugins.ghprb.extensions.build.GhprbCancelBuildsOnUpdate>
       - postbuildscript:
           script-only-if-succeeded: False
           script-only-if-failed: True
@@ -143,6 +139,7 @@
 
     triggers:
       - github-pull-request:
+          cancel-builds-on-update: true
           allow-whitelist-orgs-as-admins: true
           org-list:
             - ceph
@@ -178,11 +175,6 @@
             - ../../build/build
 
     publishers:
-      - raw:
-          xml: |
-            <org.jenkinsci.plugins.ghprb.extensions.build.GhprbCancelBuildsOnUpdate>
-              <overrideGlobal>false</overrideGlobal>
-            </org.jenkinsci.plugins.ghprb.extensions.build.GhprbCancelBuildsOnUpdate>
       - postbuildscript:
           script-only-if-succeeded: False
           script-only-if-failed: True
diff --git a/ceph-docker-prs/config/definitions/ceph-docker-prs.yml b/ceph-docker-prs/config/definitions/ceph-docker-prs.yml
index d426e858..ad6916f1 100644
--- a/ceph-docker-prs/config/definitions/ceph-docker-prs.yml
+++ b/ceph-docker-prs/config/definitions/ceph-docker-prs.yml
@@ -40,6 +40,7 @@
 
     triggers:
       - github-pull-request:
+          cancel-builds-on-update: true
           allow-whitelist-orgs-as-admins: true
           org-list:
             - ceph
@@ -74,11 +75,6 @@
             - ../../build/build
 
     publishers:
-      - raw:
-          xml: |
-            <org.jenkinsci.plugins.ghprb.extensions.build.GhprbCancelBuildsOnUpdate>
-              <overrideGlobal>false</overrideGlobal>
-            </org.jenkinsci.plugins.ghprb.extensions.build.GhprbCancelBuildsOnUpdate>
       - postbuildscript:
           script-only-if-succeeded: False
           script-only-if-failed: True