X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fxci%2Fxci-verify-jobs.yml;h=324bfd14cd9ea7c44c863929313e11dae41e89e8;hb=c6a944ba1a755bdf57523e4324093f13ee86d0c5;hp=39bdb8fc9e3ae00a1a04143680b5b813690eac57;hpb=d818173b634e7f4c910beb7e93dbee3dd032d6d7;p=releng.git

diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index 39bdb8fc9..324bfd14c 100644
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -87,15 +87,21 @@
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
+                disable-strict-forbidden-file-verification: 'true'
                 file-paths:
+                  - compare-type: ANT
+                    pattern: 'bifrost/**'
                   - compare-type: ANT
                     pattern: 'xci/**'
-                disable-strict-forbidden-file-verification: 'true'
                 forbidden-file-paths:
                   - compare-type: ANT
-                    pattern: 'bifrost/**'
+                    pattern: 'prototypes/**'
+                  - compare-type: ANT
+                    pattern: 'upstream/**'
+                  - compare-type: ANT
+                    pattern: '**/README.rst'
                   - compare-type: ANT
-                    pattern: 'README.rst'
+                    pattern: 'docs/**'
             readable-message: true
 
     parameters:
@@ -105,6 +111,9 @@
         - label:
             name: SLAVE_LABEL
             default: 'xci-virtual-{distro}'
+        - string:
+            name: CLEAN_DIB_IMAGES
+            default: 'true'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -122,6 +131,7 @@
                   predefined-parameters: |
                     DISTRO={distro}
                     DEPLOY_SCENARIO=os-nosdn-nofeature-noha
+                    CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
                   node-parameters: true
                   kill-phase-on: FAILURE
                   abort-all-job: true
@@ -134,6 +144,7 @@
                   predefined-parameters: |
                     DISTRO={distro}
                     DEPLOY_SCENARIO=os-nosdn-nofeature-noha
+                    CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
                     FUNCTEST_SUITE_NAME=healthcheck
                   node-parameters: true
                   kill-phase-on: NEVER
@@ -172,12 +183,15 @@
         - string:
             name: XCI_FLAVOR
             default: 'mini'
+        - string:
+            name: CLEAN_DIB_IMAGES
+            default: 'true'
         - string:
             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
@@ -206,6 +220,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
@@ -213,10 +233,26 @@
             cd $WORKSPACE/xci
             ./xci-deploy.sh
 
+
 - builder:
     name: 'xci-verify-healthcheck-macro'
     builders:
         - 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