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 acdd45af247440e71f8afec2ae476588644709fc..50a962f9aae090c34c99d62bcc66a4afd82522d7 100644 (file)
--- 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 b8644dd88d3005ea1887bba8e9c01c466c5bb865..d426e858f611d8110fd3bc3fb84e1a4a306bf5d6 100644 (file)
--- 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