X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fvswitchperf%2Fvswitchperf.yml;h=ba0742f3bf68aab8cd8b1183971f12771d7bda70;hb=71a9ca68b973420a90429bbd75c198c0ed7582b7;hp=d05f4c1eec58c5e2ada8e376a6c4d8a152c1f3fb;hpb=a9cabc95f41010cca5c6ab3619dc3ced845266e3;p=releng.git

diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml
index d05f4c1ee..ba0742f3b 100644
--- a/jjb/vswitchperf/vswitchperf.yml
+++ b/jjb/vswitchperf/vswitchperf.yml
@@ -15,12 +15,10 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-          slave-label: 'opnfv-build-ubuntu'
-      - danube:
+      - fraser: &fraser
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
-          slave-label: 'opnfv-build-ubuntu'
 
 - job-template:
 
@@ -28,6 +26,16 @@
 
     disabled: '{obj:disabled}'
 
+    properties:
+      - logrotate-default
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'vswitchperf-verify-.*'
+            - 'vswitchperf-merge-.*'
+            - 'vswitchperf-daily-.*'
+          block-level: 'NODE'
+
     parameters:
       - project-parameter:
           project: '{project}'
@@ -47,10 +55,8 @@
           cd src
           make clobber
           make MORE_MAKE_FLAGS="-j 10"
-          # run basic sanity test
-          make sanity
           cd ../ci
-          scl enable python33 "source ~/vsperfenv/bin/activate ; ./build-vsperf.sh daily"
+          scl enable rh-python34 "source ~/vsperfenv/bin/activate ; ./build-vsperf.sh daily"
 
 - job-template:
     name: 'vswitchperf-verify-{stream}'
@@ -68,13 +74,26 @@
           blocking-jobs:
             - 'vswitchperf-verify-.*'
             - 'vswitchperf-merge-.*'
+            - 'vswitchperf-daily-.*'
           block-level: 'NODE'
 
     parameters:
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
-      - '{slave-label}-defaults'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+      - node:
+          name: SLAVE_NAME
+          description: 'Slave name on Jenkins'
+          allowed-slaves:
+            - intel-pod12
+            - ericsson-build4
+          default-slaves:
+            - intel-pod12
+            - ericsson-build4
 
     scm:
       - git-scm-gerrit
@@ -109,8 +128,6 @@
           cd src
           make clobber
           make MORE_MAKE_FLAGS="-j 5"
-          # run basic sanity test
-          make sanity
           cd ../ci
           ./build-vsperf.sh verify
 
@@ -130,13 +147,26 @@
           blocking-jobs:
             - 'vswitchperf-verify-.*'
             - 'vswitchperf-merge-.*'
+            - 'vswitchperf-daily-.*'
           block-level: 'NODE'
 
     parameters:
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
-      - '{slave-label}-defaults'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+      - node:
+          name: SLAVE_NAME
+          description: 'Slave name on Jenkins'
+          allowed-slaves:
+            - intel-pod12
+            - ericsson-build4
+          default-slaves:
+            - intel-pod12
+            - ericsson-build4
 
     scm:
       - git-scm