From: Alfredo Deza <adeza@redhat.com>
Date: Tue, 8 Aug 2017 18:02:41 +0000 (-0400)
Subject: ceph-volume-ansible-prs: do not use raw xml, use the jjb option for ghprb
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F821%2Fhead;p=ceph-build.git

ceph-volume-ansible-prs: do not use raw xml, use the jjb option for ghprb

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml b/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml
index eebcda02..49c8ab9b 100644
--- a/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml
+++ b/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml
@@ -35,6 +35,7 @@
 
     triggers:
       - github-pull-request:
+          cancel-builds-on-update: true
           allow-whitelist-orgs-as-admins: true
           org-list:
             - ceph
@@ -70,11 +71,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