From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Tue, 8 Aug 2017 12:04:16 +0000 (+0200)
Subject: Add CancelOnUpdate option in raw/xml format
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1c3e90bb479b6302f546fe9ee607de420802e0e1;p=ceph-build.git

Add CancelOnUpdate option in raw/xml format

The option `cancel-builds-on-update` doesn't work in job template
because we are not using a recent version of JJB, therefore we had to
revert the previous commit.

This commit adds the cancel-builds-on-update option but in raw/xml
format instead.

Fixes: #817

Signed-off-by: Guillaume Abrioux <gabrioux@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 acdd45af..50a962f9 100644
--- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
+++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
@@ -106,6 +106,11 @@
             - ../../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
@@ -173,6 +178,11 @@
             - ../../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 b8644dd8..d426e858 100644
--- a/ceph-docker-prs/config/definitions/ceph-docker-prs.yml
+++ b/ceph-docker-prs/config/definitions/ceph-docker-prs.yml
@@ -74,6 +74,11 @@
             - ../../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