Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
jjb: move ssh wrappers to releng-defaults.yaml
[releng.git]
/
jjb
/
vswitchperf
/
vswitchperf.yml
diff --git
a/jjb/vswitchperf/vswitchperf.yml
b/jjb/vswitchperf/vswitchperf.yml
index
4287db0
..
9f767ce
100644
(file)
--- a/
jjb/vswitchperf/vswitchperf.yml
+++ b/
jjb/vswitchperf/vswitchperf.yml
@@
-1,10
+1,9
@@
- project:
name: vswitchperf
jobs:
- project:
name: vswitchperf
jobs:
- - 'vswitchperf-test'
- - 'vswitchperf-daily-master'
- - 'vswitchperf-merge'
- - 'vswitchperf-verify'
+ - 'vswitchperf-daily-{stream}'
+ - 'vswitchperf-merge-{stream}'
+ - 'vswitchperf-verify-{stream}'
# stream: branch with - in place of / (eg. stable-helium)
# branch: branch (eg. stable/helium)
# stream: branch with - in place of / (eg. stable-helium)
# branch: branch (eg. stable/helium)
@@
-15,23
+14,9
@@
project: 'vswitchperf'
somevar: 'foo'
project: 'vswitchperf'
somevar: 'foo'
-- job-template:
- name: vswitchperf-test
-
- project-type: freestyle
-
- logrotate:
- daysToKeep: 30
- numToKeep: 10
- artifactDaysToKeep: -1
- artifactNumToKeep: -1
-
- builders:
- - shell: |
- echo "Hello world from vswitchperf"
- job-template:
- job-template:
- name: 'vswitchperf-daily-
master
'
+ name: 'vswitchperf-daily-
{stream}
'
# Job template for daily builders
#
# Job template for daily builders
#
@@
-41,6
+26,7
@@
project-type: freestyle
varsetabove: '{somevar}'
project-type: freestyle
varsetabove: '{somevar}'
+ node: opnfv-build
logrotate:
daysToKeep: '{build-days-to-keep}'
logrotate:
daysToKeep: '{build-days-to-keep}'
@@
-51,6
+37,9
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/vswitchperf
scm:
- git-scm:
scm:
- git-scm:
@@
-58,10
+47,6
@@
refspec: ''
branch: '{branch}'
refspec: ''
branch: '{branch}'
- wrappers:
- - ssh-agent-credentials:
- user: '{ssh-credentials}'
-
triggers:
- timed: 'H H * * *'
triggers:
- timed: 'H H * * *'
@@
-72,6
+57,7
@@
- shell: |
pwd
cd src
- shell: |
pwd
cd src
+ make clobber
make
# run basic sanity test
make sanity
make
# run basic sanity test
make sanity
@@
-80,10
+66,20
@@
- test-macro
- job-template:
- test-macro
- job-template:
- name: 'vswitchperf-verify'
+ name: 'vswitchperf-verify
-{stream}
'
project-type: freestyle
project-type: freestyle
+ node: opnfv-build
+
+ concurrent: true
+
+ properties:
+ - throttle:
+ enabled: true
+ max-total: 3
+ max-per-node: 2
+
logrotate:
daysToKeep: 30
numToKeep: 10
logrotate:
daysToKeep: 30
numToKeep: 10
@@
-95,16
+91,15
@@
project: '{project}'
- gerrit-parameter:
branch: 'master'
project: '{project}'
- gerrit-parameter:
branch: 'master'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/vswitchperf
scm:
- gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
scm:
- gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
- wrappers:
- - ssh-agent-credentials:
- user: '{ssh-credentials}'
-
triggers:
- gerrit:
trigger-on:
triggers:
- gerrit:
trigger-on:
@@
-123,17
+118,21
@@
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/master'
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/master'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: 'docs/**'
builders:
- shell: |
pwd
cd src
builders:
- shell: |
pwd
cd src
+ make clobber
make
# run basic sanity test
make sanity
- job-template:
make
# run basic sanity test
make sanity
- job-template:
- name: 'vswitchperf-merge'
+ name: 'vswitchperf-merge
-{stream}
'
# builder-merge job to run JJB update
#
# builder-merge job to run JJB update
#
@@
-141,6
+140,16
@@
project-type: freestyle
project-type: freestyle
+ node: opnfv-build
+
+ concurrent: true
+
+ properties:
+ - throttle:
+ enabled: true
+ max-total: 3
+ max-per-node: 2
+
logrotate:
daysToKeep: 30
numToKeep: 40
logrotate:
daysToKeep: 30
numToKeep: 40
@@
-152,6
+161,9
@@
project: '{project}'
- gerrit-parameter:
branch: 'master'
project: '{project}'
- gerrit-parameter:
branch: 'master'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/vswitchperf
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
@@
-159,10
+171,6
@@
refspec: ''
choosing-strategy: 'default'
refspec: ''
choosing-strategy: 'default'
- wrappers:
- - ssh-agent-credentials:
- user: '{ssh-credentials}'
-
triggers:
- gerrit:
trigger-on:
triggers:
- gerrit:
trigger-on:
@@
-175,9
+183,13
@@
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/master'
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/master'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: 'docs/**'
builders:
- shell: |
pwd
cd src
builders:
- shell: |
pwd
cd src
+ make clobber
make
make