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

diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml
index 6f6d29012..28d268379 100644
--- a/jjb/ovsnfv/ovsnfv.yml
+++ b/jjb/ovsnfv/ovsnfv.yml
@@ -12,19 +12,23 @@
         - master:
             branch: '{stream}'
             gs-pathname: ''
-        - brahmaputra:
+            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-build2-defaults'
+        - 'opnfv-build-centos-defaults'
         - string:
             name: GS_URL
             default: '$GS_BASE{gs-pathname}'
@@ -38,6 +42,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -54,26 +59,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-build2-defaults'
+        - 'opnfv-build-centos-defaults'
         - string:
             name: GS_URL
             default: '$GS_BASE{gs-pathname}'
@@ -92,6 +97,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
@@ -100,26 +106,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-build2-defaults'
+        - 'opnfv-build-centos-defaults'
         - string:
             name: GS_URL
             default: '$GS_BASE{gs-pathname}'
@@ -139,6 +145,15 @@
     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
@@ -148,7 +163,3 @@
 
             cd $WORKSPACE/ci
             ./build.sh
-
-    publishers:
-        - email:
-            recipients: therbert@redhat.com mark.d.gray@intel.com billy.o.mahony@intel.com