Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Trigger test unit execution on verify + Published for jenkins"
[releng.git]
/
jjb
/
vswitchperf
/
vswitchperf.yml
diff --git
a/jjb/vswitchperf/vswitchperf.yml
b/jjb/vswitchperf/vswitchperf.yml
index
0cf7f97
..
3f7f6bf
100644
(file)
--- a/
jjb/vswitchperf/vswitchperf.yml
+++ b/
jjb/vswitchperf/vswitchperf.yml
@@
-13,14
+13,20
@@
- master:
branch: '{stream}'
gs-pathname: ''
- master:
branch: '{stream}'
gs-pathname: ''
- - brahmaputra:
+ disabled: false
+ slave-label: 'opnfv-build-ubuntu'
+ - colorado:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
+ disabled: false
+ slave-label: 'intel-pod3'
- 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}'
@@
-50,6
+56,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
+67,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-ubuntu
-defaults'
+ - '
{slave-label}
-defaults'
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
@@
-103,10
+112,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
+129,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-ubuntu
-defaults'
+ - '
{slave-label}
-defaults'
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
@@
-152,3
+166,5
@@
cd src
make clobber
make
cd src
make clobber
make
+ cd ../ci
+ ./build-vsperf.sh merge