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: Update merge and verify jobs
[releng.git]
/
jjb
/
vswitchperf
/
vswitchperf.yml
diff --git
a/jjb/vswitchperf/vswitchperf.yml
b/jjb/vswitchperf/vswitchperf.yml
index
6cc00f5
..
233cf08
100644
(file)
--- a/
jjb/vswitchperf/vswitchperf.yml
+++ b/
jjb/vswitchperf/vswitchperf.yml
@@
-1,45
+1,34
@@
- project:
- project:
+
name: vswitchperf
name: vswitchperf
+
+ project: '{name}'
+
jobs:
jobs:
- - 'vswitchperf-daily-{stream}'
- - 'vswitchperf-merge-{stream}'
- 'vswitchperf-verify-{stream}'
- 'vswitchperf-verify-{stream}'
+ - 'vswitchperf-merge-{stream}'
+ - 'vswitchperf-daily-{stream}'
- # stream: branch with - in place of / (eg. stable-helium)
- # branch: branch (eg. stable/helium)
stream:
- master:
stream:
- master:
- branch: 'master'
-
- project: 'vswitchperf'
- somevar: 'foo'
-
+ branch: '{stream}'
+ gs-pathname: ''
+ disabled: false
+ - colorado:
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ disabled: false
- job-template:
- job-template:
- name: 'vswitchperf-daily-{stream}'
- # Job template for daily builders
- #
- # Required Variables:
- # stream: branch with - in place of / (eg. stable)
- # branch: branch (eg. stable)
-
- project-type: freestyle
- varsetabove: '{somevar}'
- node: opnfv-build
+ name: 'vswitchperf-daily-{stream}'
- logrotate:
- daysToKeep: '{build-days-to-keep}'
- numToKeep: '{build-num-to-keep}'
- artifactDaysToKeep: '{build-artifact-days-to-keep}'
- artifactNumToKeep: '{build-artifact-num-to-keep}'
+ disabled: '{obj:disabled}'
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/vswitchperf
+ - 'intel-pod3-defaults'
scm:
- git-scm:
scm:
- git-scm:
@@
-47,15
+36,9
@@
refspec: ''
branch: '{branch}'
refspec: ''
branch: '{branch}'
- wrappers:
- - ssh-agent-credentials:
- user: '{ssh-credentials}'
-
triggers:
triggers:
- - timed: 'H H * * *'
-
- prebuilders:
- - test-macro
+ - pollscm:
+ cron: '@midnight'
builders:
- shell: |
builders:
- shell: |
@@
-65,16
+48,15
@@
make
# run basic sanity test
make sanity
make
# run basic sanity test
make sanity
-
- postbuilders:
- - test-macro
+ 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}'
- project-type: freestyle
+ disabled: '{obj:disabled}'
- node: opnfv-build
+ project-type: freestyle
concurrent: true
concurrent: true
@@
-83,31
+65,21
@@
enabled: true
max-total: 3
max-per-node: 2
enabled: true
max-total: 3
max-per-node: 2
-
- logrotate:
- daysToKeep: 30
- numToKeep: 10
- artifactDaysToKeep: -1
- artifactNumToKeep: -1
+ option: 'project'
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
- branch: 'master'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/vswitchperf
+ branch: '{branch}'
+ - 'opnfv-build-ubuntu-defaults'
+
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:
@@
-122,10
+94,10
@@
comment-contains-value: 'reverify'
projects:
- project-compare-type: 'ANT'
comment-contains-value: 'reverify'
projects:
- project-compare-type: 'ANT'
- project-pattern: '
vswitchperf
'
+ project-pattern: '
{project}
'
branches:
- branch-compare-type: 'ANT'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/
master
'
+ branch-pattern: '**/
{branch}
'
forbidden-file-paths:
- compare-type: ANT
pattern: 'docs/**'
forbidden-file-paths:
- compare-type: ANT
pattern: 'docs/**'
@@
-138,18
+110,16
@@
make
# run basic sanity test
make sanity
make
# run basic sanity test
make sanity
+ cd ../ci
+ ./build-vsperf.sh verify
- job-template:
name: 'vswitchperf-merge-{stream}'
- job-template:
name: 'vswitchperf-merge-{stream}'
- # builder-merge job to run JJB update
- #
- # This job's purpose is to update all the JJB
+ disabled: '{obj:disabled}'
project-type: freestyle
project-type: freestyle
- node: opnfv-build
-
concurrent: true
properties:
concurrent: true
properties:
@@
-157,21
+127,14
@@
enabled: true
max-total: 3
max-per-node: 2
enabled: true
max-total: 3
max-per-node: 2
-
- logrotate:
- daysToKeep: 30
- numToKeep: 40
- artifactDaysToKeep: -1
- artifactNumToKeep: 5
+ option: 'project'
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
- branch: 'master'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/vswitchperf
+ branch: '{branch}'
+ - 'opnfv-build-ubuntu-defaults'
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
@@
-179,10
+142,6
@@
refspec: ''
choosing-strategy: 'default'
refspec: ''
choosing-strategy: 'default'
- wrappers:
- - ssh-agent-credentials:
- user: '{ssh-credentials}'
-
triggers:
- gerrit:
trigger-on:
triggers:
- gerrit:
trigger-on:
@@
-191,10
+150,10
@@
comment-contains-value: 'remerge'
projects:
- project-compare-type: 'ANT'
comment-contains-value: 'remerge'
projects:
- project-compare-type: 'ANT'
- project-pattern: '
vswitchperf
'
+ project-pattern: '
{project}
'
branches:
- branch-compare-type: 'ANT'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/
master
'
+ branch-pattern: '**/
{branch}
'
forbidden-file-paths:
- compare-type: ANT
pattern: 'docs/**'
forbidden-file-paths:
- compare-type: ANT
pattern: 'docs/**'
@@
-205,3
+164,5
@@
cd src
make clobber
make
cd src
make clobber
make
+ cd ../ci
+ ./build-vsperf.sh merge