From 3980d5abdc15a7e33ab1e5ff160e6d92ba4e9f21 Mon Sep 17 00:00:00 2001
From: Alfredo Deza <adeza@redhat.com>
Date: Tue, 8 Aug 2017 14:02:41 -0400
Subject: [PATCH] ceph-volume-ansible-prs: do not use raw xml, use the jjb
 option for ghprb

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---
 .../config/definitions/ceph-volume-pr.yml                   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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
-- 
2.47.3