Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
vswitchperf: Update merge and verify jobs
[releng.git]
/
jjb
/
vswitchperf
/
vswitchperf.yml
diff --git
a/jjb/vswitchperf/vswitchperf.yml
b/jjb/vswitchperf/vswitchperf.yml
index
16b7d9e
..
233cf08
100644
(file)
--- a/
jjb/vswitchperf/vswitchperf.yml
+++ b/
jjb/vswitchperf/vswitchperf.yml
@@
-9,19
+9,22
@@
- 'vswitchperf-merge-{stream}'
- 'vswitchperf-daily-{stream}'
- 'vswitchperf-merge-{stream}'
- 'vswitchperf-daily-{stream}'
-# only master branch is enabled at the moment to keep no of jobs sane
stream:
- master:
stream:
- master:
- branch: '
master
'
+ branch: '
{stream}
'
gs-pathname: ''
gs-pathname: ''
-# - brahmaputra:
-# branch: 'stable/brahmaputra'
-# gs-pathname: '/brahmaputra'
+ disabled: false
+ - colorado:
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ disabled: false
- job-template:
name: 'vswitchperf-daily-{stream}'
- job-template:
name: 'vswitchperf-daily-{stream}'
+ disabled: '{obj:disabled}'
+
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
@@
-34,7
+37,8
@@
branch: '{branch}'
triggers:
branch: '{branch}'
triggers:
- - pollscm: '@midnight'
+ - pollscm:
+ cron: '@midnight'
builders:
- shell: |
builders:
- shell: |
@@
-50,6
+54,8
@@
- job-template:
name: 'vswitchperf-verify-{stream}'
- job-template:
name: 'vswitchperf-verify-{stream}'
+ disabled: '{obj:disabled}'
+
project-type: freestyle
concurrent: true
project-type: freestyle
concurrent: true
@@
-59,13
+65,14
@@
enabled: true
max-total: 3
max-per-node: 2
enabled: true
max-total: 3
max-per-node: 2
+ option: 'project'
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- - 'opnfv-build-defaults'
+ - 'opnfv-build-
ubuntu-
defaults'
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
@@
-103,10
+110,14
@@
make
# run basic sanity test
make sanity
make
# run basic sanity test
make sanity
+ cd ../ci
+ ./build-vsperf.sh verify
- job-template:
name: 'vswitchperf-merge-{stream}'
- job-template:
name: 'vswitchperf-merge-{stream}'
+ disabled: '{obj:disabled}'
+
project-type: freestyle
concurrent: true
project-type: freestyle
concurrent: true
@@
-116,13
+127,14
@@
enabled: true
max-total: 3
max-per-node: 2
enabled: true
max-total: 3
max-per-node: 2
+ option: 'project'
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- - 'opnfv-build-defaults'
+ - 'opnfv-build-
ubuntu-
defaults'
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
@@
-152,3
+164,5
@@
cd src
make clobber
make
cd src
make clobber
make
+ cd ../ci
+ ./build-vsperf.sh merge