Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
vsperf: replace intel-pod3 by intel-pod12
[releng.git]
/
jjb
/
vswitchperf
/
vswitchperf.yml
diff --git
a/jjb/vswitchperf/vswitchperf.yml
b/jjb/vswitchperf/vswitchperf.yml
index
a06507a
..
ef0e90a
100644
(file)
--- a/
jjb/vswitchperf/vswitchperf.yml
+++ b/
jjb/vswitchperf/vswitchperf.yml
@@
-9,70
+9,78
@@
- '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
+ slave-label: 'opnfv-build-ubuntu'
+ - danube:
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ disabled: true
+ slave-label: 'intel-pod12'
- 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}'
- - 'intel-pod3-defaults'
+ branch: '{branch}'
+ - 'intel-pod12-defaults'
scm:
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
triggers:
triggers:
- - timed: 'H H * * *'
+ - pollscm:
+ cron: '@midnight'
builders:
- shell: |
pwd
cd src
make clobber
builders:
- shell: |
pwd
cd src
make clobber
- make
+ make
MORE_MAKE_FLAGS="-j 10"
# run basic sanity test
make sanity
# run basic sanity test
make sanity
+ cd ../ci
+ scl enable python33 "source ~/vsperfenv/bin/activate ; ./build-vsperf.sh daily"
- 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
+ - logrotate-default
+ - build-blocker:
+ use-build-blocker: true
+ blocking-jobs:
+ - 'vswitchperf-verify-.*'
+ - 'vswitchperf-merge-.*'
+ block-level: 'NODE'
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
- - gerrit-parameter:
branch: '{branch}'
branch: '{branch}'
- - '
opnfv-build
-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'
@@
-98,38
+106,42
@@
pwd
cd src
make clobber
pwd
cd src
make clobber
- make
+ make
MORE_MAKE_FLAGS="-j 5"
# run basic sanity test
make sanity
# 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
+ - logrotate-default
+ - build-blocker:
+ use-build-blocker: true
+ blocking-jobs:
+ - 'vswitchperf-verify-.*'
+ - 'vswitchperf-merge-.*'
+ block-level: 'NODE'
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
- - gerrit-parameter:
branch: '{branch}'
branch: '{branch}'
- - '
opnfv-build
-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:
@@
-149,4
+161,6
@@
pwd
cd src
make clobber
pwd
cd src
make clobber
- make
+ make MORE_MAKE_FLAGS="-j 5"
+ cd ../ci
+ ./build-vsperf.sh merge