X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fovsnfv%2Fovsnfv.yml;h=dbe0a25fa72c71a209f985b0806c52dcba0196f4;hb=refs%2Fchanges%2F43%2F15343%2F5;hp=d4b41ee003852226dd7eaea9cd397ae229f4acf4;hpb=65a20fd8c00a8119f23e6bbace802ee430e6129f;p=releng.git

diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml
index d4b41ee00..dbe0a25fa 100644
--- a/jjb/ovsnfv/ovsnfv.yml
+++ b/jjb/ovsnfv/ovsnfv.yml
@@ -8,14 +8,13 @@
         - 'ovsnfv-merge-{stream}'
         - 'ovsnfv-daily-{stream}'
 
-# only master branch is enabled at the moment to keep no of jobs sane
     stream:
         - master:
-            branch: 'master'
+            branch: '{stream}'
             gs-pathname: ''
-#        - brahmaputra:
-#            branch: 'stable/brahmaputra'
-#            gs-pathname: '/brahmaputra'
+        - brahmaputra:
+            branch: 'stable/{stream}'
+            gs-pathname: '/{stream}'
 
 - job-template:
     name: 'ovsnfv-verify-{stream}'
@@ -25,7 +24,11 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'intel-us-build-2-defaults'
+        - 'intel-build2-defaults'
+        - string:
+            name: GS_URL
+            default: '$GS_BASE{gs-pathname}'
+            description: "Directory where the build artifact will be located upon the completion of the build."
 
     scm:
         - gerrit-trigger-scm:
@@ -51,17 +54,14 @@
                 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
-            echo "Builds have been disabled."
-#            ./build.sh
+        - build-rpms
 
 - job-template:
     name: 'ovsnfv-merge-{stream}'
@@ -71,7 +71,11 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'intel-us-build-2-defaults'
+        - 'intel-build2-defaults'
+        - string:
+            name: GS_URL
+            default: '$GS_BASE{gs-pathname}'
+            description: "Directory where the build artifact will be located upon the completion of the build."
 
     scm:
         - gerrit-trigger-scm:
@@ -79,6 +83,11 @@
             refspec: ''
             choosing-strategy: 'default'
 
+    wrappers:
+        - timeout:
+            timeout: 24
+            fail: true
+
     triggers:
         - gerrit:
             trigger-on:
@@ -89,19 +98,16 @@
               - 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
-            echo "Builds have been disabled."
-#            ./build.sh
+        - build-rpms
 
 - job-template:
     name: 'ovsnfv-daily-{stream}'
@@ -109,7 +115,11 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - 'intel-us-build-2-defaults'
+        - 'intel-build2-defaults'
+        - string:
+            name: GS_URL
+            default: '$GS_BASE{gs-pathname}'
+            description: "Directory where the build artifact will be located upon the completion of the build."
 
     scm:
         - git-scm:
@@ -117,9 +127,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
@@ -128,5 +152,4 @@
             set -o pipefail
 
             cd $WORKSPACE/ci
-            echo "Builds have been disabled."
-#            ./build.sh
+            ./build.sh