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

diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index da286878e..5ce906482 100644
--- 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
 
@@ -47,7 +56,7 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - 'compass-verify-[^-]*'
+                - 'compass-verify-[^-]*-[^-]*'
                 - 'compass-os-.*?-virtual-daily-.*?'
             block-level: 'NODE'
 
@@ -92,8 +101,11 @@
 
     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:
@@ -109,7 +121,7 @@
                 unstable-threshold: 'FAILURE'
 
 - job-template:
-    name: 'compass-verify-deploy-{stream}'
+    name: 'compass-verify-deploy-{distro}-{stream}'
 
     concurrent: true
 
@@ -160,7 +172,7 @@
         - compass-project-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
         - '{installer}-defaults'
 
     scm:
@@ -170,7 +182,7 @@
             branch: '{branch}'
 
     triggers:
-        - timed: 'H 14 * * *'
+        - timed: 'H 8 * * *'
 
     builders:
         - shell: