updating the verify job to match the new build script

[releng.git] / jjb / vswitchperf / vswitchperf.yml

diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml
index 39803aa..fe6ea49 100644 (file)
--- a/jjb/vswitchperf/vswitchperf.yml
+++ b/jjb/vswitchperf/vswitchperf.yml
@@ -9,14 +9,13 @@
         - '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'
+        - brahmaputra:
+            branch: 'stable/{stream}'
+            gs-pathname: '/{stream}'
 
 - job-template:
 
@@ -34,7 +33,8 @@
             branch: '{branch}'
 
     triggers:
-        - pollscm: '@midnight'
+        - pollscm:
+            cron: '@midnight'
 
     builders:
         - shell: |
@@ -44,10 +44,8 @@
             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}'
@@ -105,10 +103,6 @@
             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}'
@@ -158,7 +152,3 @@
             cd src
             make clobber
             make
-            scl enable python33 bash
-            source ~/vsperfenv/bin/activate
-            cd ../ci
-            ./build-vsperf.sh merge