X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fvswitchperf%2Fvswitchperf.yml;h=5f952de000e75137fa38704e6c45b639dd30d024;hb=a3131bb186d2026e98b462bcb2bb1b85bbf0285d;hp=39803aa4515c90a43bedbc9d947748632469ff7b;hpb=701d1020859e457fcd436bd58e3a3f26c15bc92e;p=releng.git

diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml
index 39803aa45..5f952de00 100644
--- a/jjb/vswitchperf/vswitchperf.yml
+++ b/jjb/vswitchperf/vswitchperf.yml
@@ -9,19 +9,24 @@
         - 'vswitchperf-merge-{stream}'
         - 'vswitchperf-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'
+            disabled: false
+            slave-label: 'opnfv-build-ubuntu'
+        - colorado:
+            branch: 'stable/{stream}'
+            gs-pathname: '/{stream}'
+            disabled: false
+            slave-label: 'intel-pod3'
 
 - job-template:
 
     name: 'vswitchperf-daily-{stream}'
 
+    disabled: '{obj:disabled}'
+
     parameters:
         - project-parameter:
             project: '{project}'
@@ -34,7 +39,8 @@
             branch: '{branch}'
 
     triggers:
-        - pollscm: '@midnight'
+        - pollscm:
+            cron: '@midnight'
 
     builders:
         - shell: |
@@ -44,30 +50,32 @@
             make
             # run basic sanity test
             make sanity
-            scl enable python33 bash
-            source ~/vsperfenv/bin/activate
             cd ../ci
-            ./build-vsperf.sh daily
+            scl enable python33 "source ~/vsperfenv/bin/activate ; ./build-vsperf.sh daily"
 
 - job-template:
     name: 'vswitchperf-verify-{stream}'
 
+    disabled: '{obj:disabled}'
+
     project-type: freestyle
 
     concurrent: true
 
     properties:
-        - throttle:
-            enabled: true
-            max-total: 3
-            max-per-node: 2
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - 'vswitchperf-verify-.*'
+                - 'vswitchperf-merge-.*'
+            block-level: 'NODE'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'opnfv-build-defaults'
+        - '{slave-label}-defaults'
 
     scm:
         - gerrit-trigger-scm:
@@ -105,30 +113,32 @@
             make
             # run basic sanity test
             make sanity
-            scl enable python33 bash
-            source ~/vsperfenv/bin/activate
             cd ../ci
             ./build-vsperf.sh verify
 
 - job-template:
     name: 'vswitchperf-merge-{stream}'
 
+    disabled: '{obj:disabled}'
+
     project-type: freestyle
 
     concurrent: true
 
     properties:
-        - throttle:
-            enabled: true
-            max-total: 3
-            max-per-node: 2
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - 'vswitchperf-verify-.*'
+                - 'vswitchperf-merge-.*'
+            block-level: 'NODE'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'opnfv-build-defaults'
+        - '{slave-label}-defaults'
 
     scm:
         - gerrit-trigger-scm:
@@ -158,7 +168,5 @@
             cd src
             make clobber
             make
-            scl enable python33 bash
-            source ~/vsperfenv/bin/activate
             cd ../ci
             ./build-vsperf.sh merge