X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass-project-jobs.yml;h=5ce906482461463df9f18e738cc86ac09af772af;hb=b20e6f4e2e172ea33c6417733e79f8b4678be263;hp=11e1d5f8a0bc2cc7d275922ae17e134889753701;hpb=0c1ce8c1ae00de21c813b18ffd5c7d6b0cc00c7e;p=releng.git

diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index 11e1d5f8a..5ce906482 100644
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -6,29 +6,38 @@
 
     project: 'compass4nfv'
 
+    slave-label: 'compass-virtual'
+
     stream:
         - master:
-            slave_name: 'huawei-us-deploy-vm-1'
             branch: '{stream}'
             gs-pathname: ''
-        - brahmaputra:
-            slave_name: 'huawei-us-deploy-vm-2'
+        - colorado:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
 
+    distro:
+        - 'trusty':
+            disabled: false
+            os-version: 'trusty'
+            openstack-os-version: ''
+        - 'centos7':
+            disabled: false
+            os-version: 'centos7'
+            openstack-os-version: ''
 
     jobs:
-        - 'compass-verify-{stream}'
+        - 'compass-verify-{distro}-{stream}'
         - 'compass-build-iso-{stream}'
         - 'compass-build-ppa-{stream}'
-        - 'compass-verify-deploy-{stream}'
+        - 'compass-verify-deploy-{distro}-{stream}'
 
 
 ########################
 # job templates
 ########################
 - job-template:
-    name: 'compass-verify-{stream}'
+    name: 'compass-verify-{distro}-{stream}'
 
     disabled: false
 
@@ -43,10 +52,11 @@
         - throttle:
             enabled: true
             max-per-node: 1
+            option: 'project'
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - 'compass-verify-[^-]*'
+                - 'compass-verify-[^-]*-[^-]*'
                 - 'compass-os-.*?-virtual-daily-.*?'
             block-level: 'NODE'
 
@@ -58,8 +68,8 @@
         - compass-project-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
-        - 'huawei-virtual-defaults'
         - '{installer}-defaults'
+        - '{slave-label}-defaults'
         - string:
             name: DEPLOY_SCENARIO
             default: 'os-nosdn-nofeature-ha'
@@ -82,19 +92,36 @@
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
+                file-paths:
+                  - compare-type: ANT
+                    pattern: '**/*'
                 forbidden-file-paths:
                   - compare-type: ANT
-                    pattern: 'docs/**|.gitignore'
+                    pattern: 'docs/**'
 
     builders:
         - trigger-builds:
-            - project: 'compass-verify-deploy-{stream}'
+            - project: 'compass-verify-deploy-{distro}-{stream}'
+              current-parameters: true
+              predefined-parameters: |
+                COMPASS_OS_VERSION={os-version}
+                COMPASS_OS_VERSION_OPTION={openstack-os-version}
+              same-node: true
+              block: true
+        - trigger-builds:
+            - project: 'functest-{slave-label}-suite-{stream}'
               current-parameters: true
+              predefined-parameters:
+                FUNCTEST_SUITE_NAME=healthcheck
               same-node: true
               block: true
+              block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
 
 - job-template:
-    name: 'compass-verify-deploy-{stream}'
+    name: 'compass-verify-deploy-{distro}-{stream}'
 
     concurrent: true
 
@@ -102,10 +129,11 @@
         - throttle:
             enabled: true
             max-per-node: 1
+            option: 'project'
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - 'compass-deploy-huawei-virtual-daily-.*?'
+                - 'compass-deploy-virtual-daily-.*?'
             block-level: 'NODE'
 
     scm:
@@ -136,6 +164,7 @@
             enabled: true
             max-total: 1
             max-per-node: 1
+            option: 'project'
 
     parameters:
         - project-parameter:
@@ -143,7 +172,7 @@
         - compass-project-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
         - '{installer}-defaults'
 
     scm:
@@ -153,7 +182,7 @@
             branch: '{branch}'
 
     triggers:
-        - timed: 'H 14 * * *'
+        - timed: 'H 8 * * *'
 
     builders:
         - shell:
@@ -177,6 +206,7 @@
             enabled: true
             max-total: 1
             max-per-node: 1
+            option: 'project'
 
     parameters:
         - project-parameter:
@@ -225,8 +255,8 @@
         - choice:
             name: COMPASS_OPENSTACK_VERSION
             choices:
+                - 'mitaka'
                 - 'liberty'
-                - 'juno'
         - choice:
             name: COMPASS_OS_VERSION
             choices: