Merge "leverage token_check only when posting results"

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

diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index 5fca9bd..f0a673b 100644 (file)
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -87,7 +87,10 @@
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
-                disable-strict-forbidden-file-verification: 'false'
+                disable-strict-forbidden-file-verification: 'true'
+                file-paths:
+                  - compare-type: ANT
+                    pattern: 'xci/**'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'bifrost/**'
@@ -97,6 +100,8 @@
                     pattern: 'upstream/**'
                   - compare-type: ANT
                     pattern: '**/README.rst'
+                  - compare-type: ANT
+                    pattern: 'docs/**'
             readable-message: true
 
     parameters:
@@ -177,8 +182,8 @@
             name: OPNFV_RELENG_DEV_PATH
             default: $WORKSPACE/
         - string:
-            name: ANSIBLE_VERBOSITY
-            default: '-vvvv'
+            name: INSTALLER_TYPE
+            default: 'osa'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -207,6 +212,12 @@
         - shell: |
             #!/bin/bash
 
+            # skip the deployment if the patch doesn't impact the deployment
+            if [[ "$GERRIT_TOPIC" =~ 'skip-verify' ]]; then
+                echo "Skipping the deployment!"
+                exit 0
+            fi
+
             # for some reason, the PATH is not set correctly
             # setting PATH for ansible stuff
             export PATH=/home/jenkins/.local/bin:$PATH
@@ -214,10 +225,26 @@
             cd $WORKSPACE/xci
             ./xci-deploy.sh
 
+
 - builder:
     name: 'xci-verify-healthcheck-macro'
     builders:
-        - shell:
-            !include-raw: ../../utils/fetch_os_creds.sh
-        - shell:
-            !include-raw: ../functest/functest-alpine.sh
+        - shell: |
+            #!/bin/bash
+
+            # skip the healthcheck if the patch doesn't impact the deployment
+            if [[ "$GERRIT_TOPIC" =~ 'skip-verify' ]]; then
+                echo "Skipping the healthcheck!"
+                exit 0
+            fi
+
+            echo "Hello World!"
+
+# this will be enabled once the xci is prepared
+#- builder:
+#    name: 'xci-verify-healthcheck-macro'
+#    builders:
+#        - shell:
+#            !include-raw: ../../utils/fetch_os_creds.sh
+#        - shell:
+#            !include-raw: ../functest/functest-alpine.sh