X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fxci%2Fxci-verify-jobs.yml;h=324bfd14cd9ea7c44c863929313e11dae41e89e8;hb=1428827b25bec913979c9c3f85672668a0b1961c;hp=61dda942aeed57f983275ff11ae278d50e60fbe9;hpb=acd3a1c5fec87dc96b5460c21f0f47f0aeff1f4e;p=releng.git

diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index 61dda942a..324bfd14c 100644
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -89,11 +89,11 @@
                     branch-pattern: '**/{branch}'
                 disable-strict-forbidden-file-verification: 'true'
                 file-paths:
+                  - compare-type: ANT
+                    pattern: 'bifrost/**'
                   - compare-type: ANT
                     pattern: 'xci/**'
                 forbidden-file-paths:
-                  - compare-type: ANT
-                    pattern: 'bifrost/**'
                   - compare-type: ANT
                     pattern: 'prototypes/**'
                   - compare-type: ANT
@@ -111,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
@@ -128,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
@@ -140,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
@@ -178,12 +183,12 @@
         - 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'
         - string:
             name: INSTALLER_TYPE
             default: 'osa'
@@ -215,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
@@ -229,6 +240,12 @@
         - 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