Merge "Trigger test unit execution on verify + Published for jenkins"

[releng.git] / jjb / compass4nfv / compass-project-jobs.yml

diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index cb5b2e5..5ce9064 100644 (file)
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -12,23 +12,32 @@
         - master:
             branch: '{stream}'
             gs-pathname: ''
-        - brahmaputra:
+        - 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'
 
@@ -91,15 +101,18 @@
 
     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=vping_userdata
+                FUNCTEST_SUITE_NAME=healthcheck
               same-node: true
               block: true
               block-thresholds:
@@ -108,7 +121,7 @@
                 unstable-threshold: 'FAILURE'
 
 - job-template:
-    name: 'compass-verify-deploy-{stream}'
+    name: 'compass-verify-deploy-{distro}-{stream}'
 
     concurrent: true
 
@@ -116,6 +129,7 @@
         - throttle:
             enabled: true
             max-per-node: 1
+            option: 'project'
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
@@ -150,6 +164,7 @@
             enabled: true
             max-total: 1
             max-per-node: 1
+            option: 'project'
 
     parameters:
         - project-parameter:
@@ -157,7 +172,7 @@
         - compass-project-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
         - '{installer}-defaults'
 
     scm:
@@ -167,7 +182,7 @@
             branch: '{branch}'
 
     triggers:
-        - timed: 'H 14 * * *'
+        - timed: 'H 8 * * *'
 
     builders:
         - shell:
@@ -191,6 +206,7 @@
             enabled: true
             max-total: 1
             max-per-node: 1
+            option: 'project'
 
     parameters:
         - project-parameter:
@@ -239,8 +255,8 @@
         - choice:
             name: COMPASS_OPENSTACK_VERSION
             choices:
-                - 'liberty'
                 - 'mitaka'
+                - 'liberty'
         - choice:
             name: COMPASS_OS_VERSION
             choices: