diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2015-11-26 17:02:46 +0100 |
|---|---|---|
| committer | Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2015-11-27 11:29:21 +0000 |
| commit | 7cf2f3c180a713ccd396e5fbb0bd9097b929b81c (patch) | |
| tree | 2c83fee83b7a11082cfc2462df408b996345afeb | |
| parent | e9269b488351819d4f9c6732b6d972216c2bde93 (diff) | |
Move vswitchperf jobs to build server pool and enable concurrent builds
This change also renames the jobs after branch name.
Change-Id: I14f4877f57f9f48fab737e21ee24a12e41d8de8c
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
| -rw-r--r-- | jjb/vswitchperf/vswitchperf.yml | 47 |
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 |