summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/vswitchperf/vswitchperf.yml47
1 files changed, 25 insertions, 22 deletions
diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml
index 07ce11414..6cc00f51e 100644
--- a/jjb/vswitchperf/vswitchperf.yml
+++ b/jjb/vswitchperf/vswitchperf.yml
@@ -1,10 +1,9 @@
- project:
name: vswitchperf
jobs:
- - 'vswitchperf-test'
- 'vswitchperf-daily-{stream}'
- - 'vswitchperf-merge'
- - 'vswitchperf-verify'
+ - 'vswitchperf-merge-{stream}'
+ - 'vswitchperf-verify-{stream}'
# stream: branch with - in place of / (eg. stable-helium)
# branch: branch (eg. stable/helium)
@@ -15,20 +14,6 @@
project: 'vswitchperf'
somevar: 'foo'
-- job-template:
- name: vswitchperf-test
-
- project-type: freestyle
-
- logrotate:
- daysToKeep: 30
- numToKeep: 10
- artifactDaysToKeep: -1
- artifactNumToKeep: -1
-
- builders:
- - shell: |
- echo "Hello world from vswitchperf"
- job-template:
name: 'vswitchperf-daily-{stream}'
@@ -41,7 +26,7 @@
project-type: freestyle
varsetabove: '{somevar}'
- node: ericsson-build
+ node: opnfv-build
logrotate:
daysToKeep: '{build-days-to-keep}'
@@ -85,10 +70,19 @@
- test-macro
- job-template:
- name: 'vswitchperf-verify'
+ name: 'vswitchperf-verify-{stream}'
project-type: freestyle
- node: ericsson-build
+
+ node: opnfv-build
+
+ concurrent: true
+
+ properties:
+ - throttle:
+ enabled: true
+ max-total: 3
+ max-per-node: 2
logrotate:
daysToKeep: 30
@@ -146,14 +140,23 @@
make sanity
- job-template:
- name: 'vswitchperf-merge'
+ name: 'vswitchperf-merge-{stream}'
# builder-merge job to run JJB update
#
# This job's purpose is to update all the JJB
project-type: freestyle
- node: ericsson-build
+
+ node: opnfv-build
+
+ concurrent: true
+
+ properties:
+ - throttle:
+ enabled: true
+ max-total: 3
+ max-per-node: 2
logrotate:
daysToKeep: 30