X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fvswitchperf%2Fvswitchperf.yml;h=cda5128e22d6fdc9d361ea0d68681ba424705122;hb=8ea5b3a2e506ef3bbae983c0b2d5b13b3a22e768;hp=bf2fe8faaa36cc79f1ec986078709b5a953b9a64;hpb=7b6b30cc6878fcdc199d64874c896825d89fe5d4;p=releng.git

diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml
index bf2fe8faa..cda5128e2 100644
--- a/jjb/vswitchperf/vswitchperf.yml
+++ b/jjb/vswitchperf/vswitchperf.yml
@@ -13,14 +13,20 @@
         - master:
             branch: '{stream}'
             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}'
@@ -50,23 +56,26 @@
 - 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
-            option: 'project'
+        - 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-ubuntu-defaults'
+        - '{slave-label}-defaults'
 
     scm:
         - gerrit-trigger-scm:
@@ -76,6 +85,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -104,27 +114,32 @@
             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
 
     properties:
-        - throttle:
-            enabled: true
-            max-total: 3
-            max-per-node: 2
-            option: 'project'
+        - 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-ubuntu-defaults'
+        - '{slave-label}-defaults'
 
     scm:
         - gerrit-trigger-scm:
@@ -134,6 +149,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
@@ -154,3 +170,5 @@
             cd src
             make clobber
             make
+            cd ../ci
+            ./build-vsperf.sh merge