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: Utilize more CPU cores during build
[releng.git]
/
jjb
/
vswitchperf
/
vswitchperf.yml
diff --git
a/jjb/vswitchperf/vswitchperf.yml
b/jjb/vswitchperf/vswitchperf.yml
index
233cf08
..
fe8ea53
100644
(file)
--- a/
jjb/vswitchperf/vswitchperf.yml
+++ b/
jjb/vswitchperf/vswitchperf.yml
@@
-14,10
+14,12
@@
branch: '{stream}'
gs-pathname: ''
disabled: false
branch: '{stream}'
gs-pathname: ''
disabled: false
+ slave-label: 'opnfv-build-ubuntu'
- colorado:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
- colorado:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
+ slave-label: 'intel-pod3'
- job-template:
- job-template:
@@
-28,13
+30,12
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
- 'intel-pod3-defaults'
scm:
- 'intel-pod3-defaults'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
triggers:
- pollscm:
triggers:
- pollscm:
@@
-45,7
+46,7
@@
pwd
cd src
make clobber
pwd
cd src
make clobber
- make
+ make
MORE_MAKE_FLAGS="-j 10"
# run basic sanity test
make sanity
cd ../ci
# run basic sanity test
make sanity
cd ../ci
@@
-61,27
+62,26
@@
concurrent: true
properties:
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:
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
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'
@@
-107,7
+107,7
@@
pwd
cd src
make clobber
pwd
cd src
make clobber
- make
+ make
MORE_MAKE_FLAGS="-j 5"
# run basic sanity test
make sanity
cd ../ci
# run basic sanity test
make sanity
cd ../ci
@@
-123,27
+123,26
@@
concurrent: true
properties:
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:
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
+ - git-scm
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:
@@
-163,6
+162,6
@@
pwd
cd src
make clobber
pwd
cd src
make clobber
- make
+ make
MORE_MAKE_FLAGS="-j 5"
cd ../ci
./build-vsperf.sh merge
cd ../ci
./build-vsperf.sh merge