X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fvswitchperf%2Fvswitchperf.yml;h=3f7f6bf2d5fec1c8983175c8519f498bef942186;hb=b20e6f4e2e172ea33c6417733e79f8b4678be263;hp=a06507a14be793085214e169a62cbac0e91bdde3;hpb=93e45bc5f7b4144d98373c4b54e23db1d51b221e;p=releng.git

diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml
index a06507a14..3f7f6bf2d 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:
-        - timed: 'H H * * *'
+        - pollscm:
+            cron: '@midnight'
 
     builders:
         - shell: |
@@ -44,10 +50,14 @@
             make
             # run basic sanity test
             make sanity
+            cd ../ci
+            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
@@ -57,13 +67,14 @@
             enabled: true
             max-total: 3
             max-per-node: 2
+            option: 'project'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'opnfv-build-defaults'
+        - '{slave-label}-defaults'
 
     scm:
         - gerrit-trigger-scm:
@@ -101,10 +112,14 @@
             make
             # run basic sanity test
             make sanity
+            cd ../ci
+            ./build-vsperf.sh verify
 
 - job-template:
     name: 'vswitchperf-merge-{stream}'
 
+    disabled: '{obj:disabled}'
+
     project-type: freestyle
 
     concurrent: true
@@ -114,13 +129,14 @@
             enabled: true
             max-total: 3
             max-per-node: 2
+            option: 'project'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'opnfv-build-defaults'
+        - '{slave-label}-defaults'
 
     scm:
         - gerrit-trigger-scm:
@@ -150,3 +166,5 @@
             cd src
             make clobber
             make
+            cd ../ci
+            ./build-vsperf.sh merge