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: Fix Danube VERIFY and MERGE jobs
[releng.git]
/
jjb
/
vswitchperf
/
vswitchperf.yml
diff --git
a/jjb/vswitchperf/vswitchperf.yml
b/jjb/vswitchperf/vswitchperf.yml
index
5f952de
..
715305b
100644
(file)
--- a/
jjb/vswitchperf/vswitchperf.yml
+++ b/
jjb/vswitchperf/vswitchperf.yml
@@
-15,11
+15,11
@@
gs-pathname: ''
disabled: false
slave-label: 'opnfv-build-ubuntu'
gs-pathname: ''
disabled: false
slave-label: 'opnfv-build-ubuntu'
- -
colorado
:
+ -
danube
:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
- slave-label: '
intel-pod3
'
+ slave-label: '
opnfv-build-ubuntu
'
- job-template:
- job-template:
@@
-30,13
+30,11
@@
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:
- pollscm:
triggers:
- pollscm:
@@
-47,7
+45,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
@@
-63,6
+61,7
@@
concurrent: true
properties:
concurrent: true
properties:
+ - logrotate-default
- build-blocker:
use-build-blocker: true
blocking-jobs:
- build-blocker:
use-build-blocker: true
blocking-jobs:
@@
-73,18
+72,15
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
- - gerrit-parameter:
branch: '{branch}'
- '{slave-label}-defaults'
scm:
branch: '{branch}'
- '{slave-label}-defaults'
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'
@@
-110,7
+106,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
@@
-126,6
+122,7
@@
concurrent: true
properties:
concurrent: true
properties:
+ - logrotate-default
- build-blocker:
use-build-blocker: true
blocking-jobs:
- build-blocker:
use-build-blocker: true
blocking-jobs:
@@
-136,18
+133,15
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
- - gerrit-parameter:
branch: '{branch}'
- '{slave-label}-defaults'
scm:
branch: '{branch}'
- '{slave-label}-defaults'
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:
@@
-167,6
+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
cd ../ci
./build-vsperf.sh merge