Merge "jjb: xci: xci-verify-jobs: Do not trigger on forbidden paths"

diff --combined jjb/xci/xci-verify-jobs.yml
index bf4e60e,7ca25e4..1980fca
--- 1/jjb/xci/xci-verify-jobs.yml
--- 2/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@@ -106,16 -106,8 +106,8 @@@
                branches:
                  - branch-compare-type: 'ANT'
                    branch-pattern: '**/{branch}'
-               disable-strict-forbidden-file-verification: 'true'
+               disable-strict-forbidden-file-verification: 'false'
                forbidden-file-paths:
-                 - compare-type: ANT
-                   pattern: 'prototypes/**'
-                 - compare-type: ANT
-                   pattern: 'upstream/**'
-                 - compare-type: ANT
-                   pattern: '**/README.rst'
-                 - compare-type: ANT
-                   pattern: 'docs/**'
                  - compare-type: ANT
                    pattern: 'xci/scripts/vm/**'
            readable-message: true
@@@ -152,7 -144,7 +144,7 @@@
                current-parameters: true
                predefined-parameters: |
                  DISTRO={distro}
 -                DEPLOY_SCENARIO=os-nosdn-nofeature-noha
 +                DEPLOY_SCENARIO=os-nosdn-nofeature
                  CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
                  GERRIT_BRANCH=$GERRIT_BRANCH
                  GERRIT_REFSPEC=$GERRIT_REFSPEC
@@@ -169,7 -161,7 +161,7 @@@
                current-parameters: true
                predefined-parameters: |
                  DISTRO={distro}
 -                DEPLOY_SCENARIO=os-nosdn-nofeature-noha
 +                DEPLOY_SCENARIO=os-nosdn-nofeature
                  CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
                  FUNCTEST_MODE=tier
                  FUNCTEST_TIER=healthcheck
@@@ -208,7 -200,7 +200,7 @@@
            default: 'ubuntu'
        - string:
            name: DEPLOY_SCENARIO
 -          default: 'os-nosdn-nofeature-noha'
 +          default: 'os-nosdn-nofeature'
        - string:
            name: FUNCTEST_MODE
            default: 'tier'