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 Stable Branch Jobs for sfc"
[releng.git]
/
jjb
/
vswitchperf
/
vswitchperf.yml
diff --git
a/jjb/vswitchperf/vswitchperf.yml
b/jjb/vswitchperf/vswitchperf.yml
index
16ceb2e
..
01a154a
100644
(file)
--- a/
jjb/vswitchperf/vswitchperf.yml
+++ b/
jjb/vswitchperf/vswitchperf.yml
@@
-15,6
+15,10
@@
branch: '{stream}'
gs-pathname: ''
disabled: false
branch: '{stream}'
gs-pathname: ''
disabled: false
+ - fraser: &fraser
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ disabled: false
- euphrates:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
- euphrates:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
@@
-26,6
+30,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}'
@@
-45,10
+59,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}'
@@
-66,6
+78,7
@@
blocking-jobs:
- 'vswitchperf-verify-.*'
- 'vswitchperf-merge-.*'
blocking-jobs:
- 'vswitchperf-verify-.*'
- 'vswitchperf-merge-.*'
+ - 'vswitchperf-daily-.*'
block-level: 'NODE'
parameters:
block-level: 'NODE'
parameters:
@@
-80,8
+93,10
@@
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
+ - intel-pod12
- ericsson-build4
default-slaves:
- ericsson-build4
default-slaves:
+ - intel-pod12
- ericsson-build4
scm:
- ericsson-build4
scm:
@@
-117,8
+132,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
@@
-138,6
+151,7
@@
blocking-jobs:
- 'vswitchperf-verify-.*'
- 'vswitchperf-merge-.*'
blocking-jobs:
- 'vswitchperf-verify-.*'
- 'vswitchperf-merge-.*'
+ - 'vswitchperf-daily-.*'
block-level: 'NODE'
parameters:
block-level: 'NODE'
parameters:
@@
-152,8
+166,10
@@
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
+ - intel-pod12
- ericsson-build4
default-slaves:
- ericsson-build4
default-slaves:
+ - intel-pod12
- ericsson-build4
scm:
- ericsson-build4
scm: