X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fovsnfv%2Fovsnfv.yml;h=28d2683794cfc8853fb3e4d55ef4465d29aee05c;hb=cc8c74caed5b1e767f351bbb83adc53d0b3b00fd;hp=224a81f880e577687d6b4fe3abacaa9ce838758d;hpb=05daeeb4f90eb5a8ab0a928bc7c9d6414b5c1905;p=releng.git

diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml
index 224a81f88..28d268379 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,30 +10,29 @@
 
     stream:
         - master:
-            branch: 'master'
-
-    project: 'ovsnfv'
+            branch: '{stream}'
+            gs-pathname: ''
+            disabled: false
+        - colorado:
+            branch: 'stable/{stream}'
+            gs-pathname: '/{stream}'
+            disabled: false
 
 - job-template:
     name: 'ovsnfv-verify-{stream}'
 
-    node: opnfv-build
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+    disabled: '{obj:disabled}'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
+        - 'opnfv-build-centos-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:
@@ -40,6 +42,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -52,35 +55,34 @@
                     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
+    disabled: '{obj:disabled}'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
+        - 'opnfv-build-centos-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:
@@ -88,43 +90,46 @@
             refspec: ''
             choosing-strategy: 'default'
 
+    wrappers:
+        - timeout:
+            timeout: 24
+            fail: true
+
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
                     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
+    disabled: '{obj:disabled}'
 
     parameters:
         - project-parameter:
             project: '{project}'
+        - 'opnfv-build-centos-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:
@@ -132,9 +137,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