X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fovsnfv%2Fovsnfv.yml;h=c6f3e4a51035a30d58448ce557ff651e936c6277;hb=4f89c206b9d968c4f464cd71f6f6390bd7b56f3e;hp=f29219c9730c75772bcbaee48f0911e1cdc14d59;hpb=8fc626e74e066567a17be02e3e593bde16d9bf62;p=releng.git

diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml
index f29219c97..c6f3e4a51 100644
--- a/jjb/ovsnfv/ovsnfv.yml
+++ b/jjb/ovsnfv/ovsnfv.yml
@@ -8,24 +8,27 @@
         - 'ovsnfv-merge-{stream}'
         - 'ovsnfv-daily-{stream}'
 
-# only master branch is enabled at the moment to keep no of jobs sane
     stream:
         - master:
             branch: '{stream}'
             gs-pathname: ''
-#        - brahmaputra:
-#            branch: 'stable/brahmaputra'
-#            gs-pathname: '/{stream}'
+            disabled: false
+        - colorado:
+            branch: 'stable/{stream}'
+            gs-pathname: '/{stream}'
+            disabled: false
 
 - job-template:
     name: 'ovsnfv-verify-{stream}'
 
+    disabled: '{obj:disabled}'
+
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'intel-us-build-2-defaults'
+        - 'opnfv-build-centos-defaults'
         - string:
             name: GS_URL
             default: '$GS_BASE{gs-pathname}'
@@ -55,26 +58,26 @@
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
+                file-paths:
+                  - compare-type: ANT
+                    pattern: 'build/**'
+                  - compare-type: ANT
+                    pattern: 'ci/**'
 
     builders:
-        - shell: |
-            #!/bin/bash
-            set -o errexit
-            set -o nounset
-            set -o pipefail
-
-            cd $WORKSPACE/ci
-            ./build.sh
+        - build-rpms
 
 - job-template:
     name: 'ovsnfv-merge-{stream}'
 
+    disabled: '{obj:disabled}'
+
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'intel-us-build-2-defaults'
+        - 'opnfv-build-centos-defaults'
         - string:
             name: GS_URL
             default: '$GS_BASE{gs-pathname}'
@@ -86,6 +89,11 @@
             refspec: ''
             choosing-strategy: 'default'
 
+    wrappers:
+        - timeout:
+            timeout: 24
+            fail: true
+
     triggers:
         - gerrit:
             trigger-on:
@@ -96,26 +104,26 @@
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'
                 branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/{branch}'
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+                file-paths:
+                  - compare-type: ANT
+                    pattern: 'build/**'
+                  - compare-type: ANT
+                    pattern: 'ci/**'
 
     builders:
-        - shell: |
-            #!/bin/bash
-            set -o errexit
-            set -o nounset
-            set -o pipefail
-
-            cd $WORKSPACE/ci
-            ./build.sh
+        - build-rpms
 
 - job-template:
     name: 'ovsnfv-daily-{stream}'
 
+    disabled: '{obj:disabled}'
+
     parameters:
         - project-parameter:
             project: '{project}'
-        - 'intel-us-build-2-defaults'
+        - 'opnfv-build-centos-defaults'
         - string:
             name: GS_URL
             default: '$GS_BASE{gs-pathname}'
@@ -127,9 +135,23 @@
             refspec: ''
             branch: '{branch}'
 
+    wrappers:
+        - timeout:
+            timeout: 24
+            fail: true
+
     triggers:
         - timed: '@midnight'
 
+    builders:
+        - build-rpms
+
+    publishers:
+        - email:
+            recipients: therbert@redhat.com mark.d.gray@intel.com billy.o.mahony@intel.com
+
+- builder:
+    name: build-rpms
     builders:
         - shell: |
             #!/bin/bash