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

diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index 6bc064253..324bfd14c 100644
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -75,7 +75,7 @@
                 - patchset-created-event:
                     exclude-drafts: 'false'
                     exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
+                    exclude-no-code-change: 'true'
                 - draft-published-event
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
@@ -87,19 +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: 'openstack-ansible/**'
+                    pattern: 'upstream/**'
                   - compare-type: ANT
-                    pattern: 'puppet-infracloud/**'
+                    pattern: '**/README.rst'
                   - compare-type: ANT
-                    pattern: 'README.rst'
+                    pattern: 'docs/**'
             readable-message: true
 
     parameters:
@@ -109,6 +111,13 @@
         - 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
+            description: 'Git URL to use on this Jenkins Slave'
 
     builders:
         - description-setter:
@@ -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
@@ -130,10 +140,11 @@
             condition: SUCCESSFUL
             projects:
                 - name: 'xci-verify-healthcheck-{type}-{stream}'
-                  current-parameters: false
+                  current-parameters: true
                   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
@@ -162,7 +173,7 @@
     parameters:
         - string:
             name: DISTRO
-            default: '{distro}'
+            default: 'xenial'
         - string:
             name: DEPLOY_SCENARIO
             default: 'os-nosdn-nofeature-noha'
@@ -173,11 +184,18 @@
             name: XCI_FLAVOR
             default: 'mini'
         - string:
-            name: XCI_DEVEL_ROOT
-            default: $WORKSPACE
+            name: CLEAN_DIB_IMAGES
+            default: 'true'
         - string:
-            name: ANSIBLE_VERBOSITY
-            default: '-vvvv'
+            name: OPNFV_RELENG_DEV_PATH
+            default: $WORKSPACE/
+        - string:
+            name: INSTALLER_TYPE
+            default: 'osa'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
 
     wrappers:
         - ssh-agent-wrapper
@@ -202,13 +220,39 @@
         - shell: |
             #!/bin/bash
 
-            cd $WORKSPACE
+            # 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
+
+            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