Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
undo healthcheck in verify job
[releng.git]
/
jjb
/
vswitchperf
/
vswitchperf.yml
diff --git
a/jjb/vswitchperf/vswitchperf.yml
b/jjb/vswitchperf/vswitchperf.yml
index
bf2fe8f
..
cda5128
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,23
+56,26
@@
- job-template:
name: 'vswitchperf-verify-{stream}'
- job-template:
name: 'vswitchperf-verify-{stream}'
+ disabled: '{obj:disabled}'
+
project-type: freestyle
concurrent: true
properties:
project-type: freestyle
concurrent: true
properties:
- - throttle:
- enabled: true
- max-total: 3
- max-per-node: 2
- option: 'project'
+ - build-blocker:
+ use-build-blocker: true
+ blocking-jobs:
+ - 'vswitchperf-verify-.*'
+ - 'vswitchperf-merge-.*'
+ block-level: 'NODE'
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:
@@
-76,6
+85,7
@@
triggers:
- gerrit:
triggers:
- gerrit:
+ server-name: 'gerrit.opnfv.org'
trigger-on:
- patchset-created-event:
exclude-drafts: 'false'
trigger-on:
- patchset-created-event:
exclude-drafts: 'false'
@@
-104,27
+114,32
@@
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
properties:
project-type: freestyle
concurrent: true
properties:
- - throttle:
- enabled: true
- max-total: 3
- max-per-node: 2
- option: 'project'
+ - build-blocker:
+ use-build-blocker: true
+ blocking-jobs:
+ - 'vswitchperf-verify-.*'
+ - 'vswitchperf-merge-.*'
+ block-level: 'NODE'
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:
@@
-134,6
+149,7
@@
triggers:
- gerrit:
triggers:
- gerrit:
+ server-name: 'gerrit.opnfv.org'
trigger-on:
- change-merged-event
- comment-added-contains-event:
trigger-on:
- change-merged-event
- comment-added-contains-event:
@@
-154,3
+170,5
@@
cd src
make clobber
make
cd src
make clobber
make
+ cd ../ci
+ ./build-vsperf.sh merge