Merge "xci: Enable post merge promotion for generic scenarios"

diff --combined jjb/xci/xci-merge-jobs.yml
index 34d3b66,e473fff..df8bbb4
--- 1/jjb/xci/xci-merge-jobs.yml
--- 2/jjb/xci/xci-merge-jobs.yml
+++ b/jjb/xci/xci-merge-jobs.yml
@@@ -65,6 -65,21 +65,21 @@@
              - comment-added-contains-event:
                  comment-contains-value: 'remerge'
            projects:
+             - project-compare-type: 'ANT'
+               project-pattern: 'releng-xci'
+               branches:
+                 - branch-compare-type: 'ANT'
+                   branch-pattern: '**/{branch}'
+               disable-strict-forbidden-file-verification: 'false'
+               forbidden-file-paths:
+                 - compare-type: ANT
+                   pattern: 'xci/scripts/vm/**'
+                 - compare-type: ANT
+                   pattern: 'docs/**'
+                 - compare-type: ANT
+                   pattern: 'prototypes/**'
+                 - compare-type: ANT
+                   pattern: 'upstream/**'
              - project-compare-type: 'REG_EXP'
                project-pattern: 'sfc|sdnvpn'
                branches:
@@@ -142,8 -157,8 +157,8 @@@
                  GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                  GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
                node-parameters: false
 -              kill-phase-on: FAILURE
 -              abort-all-job: true
 +              kill-phase-on: NEVER
 +              abort-all-job: false
        - inject:
            properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties"
        - multijob: