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=6769f682a8fa5e7e84303bb2ae8d8c0b6b53bb50;hpb=0b27c3e7e7ada718ba16a8ec78edfed52ae0bf15;p=releng.git

diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml
index 6769f682a..dbe0a25fa 100644
--- a/jjb/ovsnfv/ovsnfv.yml
+++ b/jjb/ovsnfv/ovsnfv.yml
@@ -1,5 +1,8 @@
 - project:
     name: ovsnfv
+
+    project: '{name}'
+
     jobs:
         - 'ovsnfv-verify-{stream}'
         - 'ovsnfv-merge-{stream}'
@@ -7,24 +10,25 @@
 
     stream:
         - master:
-            branch: 'master'
-
-    project: 'ovsnfv'
+            branch: '{stream}'
+            gs-pathname: ''
+        - brahmaputra:
+            branch: 'stable/{stream}'
+            gs-pathname: '/{stream}'
 
 - job-template:
     name: 'ovsnfv-verify-{stream}'
 
-    node: opnfv-build
-
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
+        - 'intel-build2-defaults'
         - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+            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:
@@ -46,35 +50,32 @@
                     comment-contains-value: 'reverify'
             projects:
               - project-compare-type: 'ANT'
-                project-pattern: 'ovsnfv'
+                project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
+                    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}'
 
-    node: opnfv-build
-
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
+        - 'intel-build2-defaults'
         - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+            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:
@@ -82,6 +83,11 @@
             refspec: ''
             choosing-strategy: 'default'
 
+    wrappers:
+        - timeout:
+            timeout: 24
+            fail: true
+
     triggers:
         - gerrit:
             trigger-on:
@@ -90,35 +96,30 @@
                     comment-contains-value: 'remerge'
             projects:
               - project-compare-type: 'ANT'
-                project-pattern: 'ovsnfv'
+                project-pattern: '{project}'
                 branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
+                  - 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}'
 
-    node: opnfv-build
-
-    disabled: true
-
     parameters:
         - project-parameter:
             project: '{project}'
+        - 'intel-build2-defaults'
         - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+            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:
@@ -126,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