X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fxci%2Fxci-merge-jobs.yml;h=92eea190f8f33a21c18c098faa72156825e6045d;hb=02de323b37750966ea0a64394aa458d2915d9150;hp=492348d631050bae609a1540300d5c6c291b8a4f;hpb=83a7a4ac9d2966010eac2b6ce5af2904276e55c8;p=releng.git

diff --git a/jjb/xci/xci-merge-jobs.yml b/jjb/xci/xci-merge-jobs.yml
index 492348d63..92eea190f 100644
--- a/jjb/xci/xci-merge-jobs.yml
+++ b/jjb/xci/xci-merge-jobs.yml
@@ -167,6 +167,14 @@
               kill-phase-on: NEVER
               abort-all-job: true
 
+    publishers:
+      - postbuildscript:
+          script-only-if-succeeded: false
+          script-only-if-failed: false
+          builders:
+            - shell:
+                !include-raw: ./xci-cleanup.sh
+
 - job-template:
     name: 'xci-{phase}-{type}-{distro}-merge-{stream}'
 
@@ -253,8 +261,6 @@
     builders:
       - shell:
           !include-raw: ./xci-run-functest.sh
-      - shell:
-          !include-raw: ./xci-cleanup.sh
 
 - builder:
     name: 'xci-merge-promote-macro'