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 "Create CI job for network testing"
[releng.git]
/
jjb
/
vswitchperf
/
vswitchperf.yml
diff --git
a/jjb/vswitchperf/vswitchperf.yml
b/jjb/vswitchperf/vswitchperf.yml
index
bab8b24
..
ba0742f
100644
(file)
--- a/
jjb/vswitchperf/vswitchperf.yml
+++ b/
jjb/vswitchperf/vswitchperf.yml
@@
-15,12
+15,10
@@
branch: '{stream}'
gs-pathname: ''
disabled: false
branch: '{stream}'
gs-pathname: ''
disabled: false
- slave-label: 'opnfv-build-ubuntu'
- - euphrates:
+ - fraser: &fraser
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
- slave-label: 'opnfv-build-ubuntu'
- job-template:
- job-template:
@@
-28,6
+26,16
@@
disabled: '{obj:disabled}'
disabled: '{obj:disabled}'
+ properties:
+ - logrotate-default
+ - build-blocker:
+ use-build-blocker: true
+ blocking-jobs:
+ - 'vswitchperf-verify-.*'
+ - 'vswitchperf-merge-.*'
+ - 'vswitchperf-daily-.*'
+ block-level: 'NODE'
+
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
@@
-47,10
+55,8
@@
cd src
make clobber
make MORE_MAKE_FLAGS="-j 10"
cd src
make clobber
make MORE_MAKE_FLAGS="-j 10"
- # run basic sanity test
- make sanity
cd ../ci
cd ../ci
- scl enable
python33
"source ~/vsperfenv/bin/activate ; ./build-vsperf.sh daily"
+ scl enable
rh-python34
"source ~/vsperfenv/bin/activate ; ./build-vsperf.sh daily"
- job-template:
name: 'vswitchperf-verify-{stream}'
- job-template:
name: 'vswitchperf-verify-{stream}'
@@
-68,13
+74,26
@@
blocking-jobs:
- 'vswitchperf-verify-.*'
- 'vswitchperf-merge-.*'
blocking-jobs:
- 'vswitchperf-verify-.*'
- 'vswitchperf-merge-.*'
+ - 'vswitchperf-daily-.*'
block-level: 'NODE'
parameters:
- project-parameter:
project: '{project}'
branch: '{branch}'
block-level: 'NODE'
parameters:
- project-parameter:
project: '{project}'
branch: '{branch}'
- - '{slave-label}-defaults'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
+ - node:
+ name: SLAVE_NAME
+ description: 'Slave name on Jenkins'
+ allowed-slaves:
+ - intel-pod12
+ - ericsson-build4
+ default-slaves:
+ - intel-pod12
+ - ericsson-build4
scm:
- git-scm-gerrit
scm:
- git-scm-gerrit
@@
-109,8
+128,6
@@
cd src
make clobber
make MORE_MAKE_FLAGS="-j 5"
cd src
make clobber
make MORE_MAKE_FLAGS="-j 5"
- # run basic sanity test
- make sanity
cd ../ci
./build-vsperf.sh verify
cd ../ci
./build-vsperf.sh verify
@@
-130,13
+147,26
@@
blocking-jobs:
- 'vswitchperf-verify-.*'
- 'vswitchperf-merge-.*'
blocking-jobs:
- 'vswitchperf-verify-.*'
- 'vswitchperf-merge-.*'
+ - 'vswitchperf-daily-.*'
block-level: 'NODE'
parameters:
- project-parameter:
project: '{project}'
branch: '{branch}'
block-level: 'NODE'
parameters:
- project-parameter:
project: '{project}'
branch: '{branch}'
- - '{slave-label}-defaults'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
+ - node:
+ name: SLAVE_NAME
+ description: 'Slave name on Jenkins'
+ allowed-slaves:
+ - intel-pod12
+ - ericsson-build4
+ default-slaves:
+ - intel-pod12
+ - ericsson-build4
scm:
- git-scm
scm:
- git-scm