xci: Do not trigger merge jobs for INFO.yaml updates

[releng.git] / jjb / xci / xci-merge-jobs.yml

diff --git a/jjb/xci/xci-merge-jobs.yml b/jjb/xci/xci-merge-jobs.yml
index df2d38e..e4e5705 100644 (file)
--- a/jjb/xci/xci-merge-jobs.yml
+++ b/jjb/xci/xci-merge-jobs.yml
@@ -9,16 +9,23 @@
     stream:
       - master:
           branch: '{stream}'
+          disabled: false
     # -------------------------------
     # distros
     # -------------------------------
     distro:
       - ubuntu:
           disabled: false
+          kill-phase-on: FAILURE
+          abort-all-job: true
       - centos:
-          disabled: false
+          disabled: true
+          kill-phase-on: NEVER
+          abort-all-job: false
       - opensuse:
           disabled: false
+          kill-phase-on: FAILURE
+          abort-all-job: true
     # -------------------------------
     # postmerge promotion phases
     # -------------------------------
@@ -41,7 +48,7 @@
 
     project-type: multijob
 
-    disabled: false
+    disabled: '{obj:disabled}'
 
     concurrent: false
 
@@ -80,6 +87,8 @@
                   pattern: 'prototypes/**'
                 - compare-type: ANT
                   pattern: 'upstream/**'
+                - compare-type: ANT
+                  pattern: 'INFO.yaml'
             - project-compare-type: 'REG_EXP'
               project-pattern: 'sfc|sdnvpn'
               branches:
@@ -203,7 +212,7 @@
 
     project-type: multijob
 
-    disabled: false
+    disabled: '{obj:disabled}'
 
     concurrent: false
 
@@ -282,8 +291,8 @@
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               node-parameters: true
-              kill-phase-on: FAILURE
-              abort-all-job: true
+              kill-phase-on: '{kill-phase-on}'
+              abort-all-job: '{abort-all-job}'
       - multijob:
           name: healthcheck
           condition: SUCCESSFUL
@@ -302,8 +311,8 @@
                 FUNCTEST_MODE=$FUNCTEST_MODE
                 FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
               node-parameters: true
-              kill-phase-on: NEVER
-              abort-all-job: true
+              kill-phase-on: '{kill-phase-on}'
+              abort-all-job: '{abort-all-job}'
 
     publishers:
       - postbuildscript: