Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update vswitch perf jjb to use pod-params file
[releng.git]
/
jjb
/
vswitchperf
/
vswitchperf.yml
diff --git
a/jjb/vswitchperf/vswitchperf.yml
b/jjb/vswitchperf/vswitchperf.yml
index
b4bc70f
..
a06507a
100644
(file)
--- a/
jjb/vswitchperf/vswitchperf.yml
+++ b/
jjb/vswitchperf/vswitchperf.yml
@@
-1,37
+1,31
@@
- 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)
+# only master branch is enabled at the moment to keep no of jobs sane
stream:
- master:
branch: 'master'
stream:
- master:
branch: 'master'
-
- project: 'vswitchperf'
- somevar: 'foo'
+ gs-pathname: ''
+# - brahmaputra:
+# branch: 'stable/brahmaputra'
+# gs-pathname: '/brahmaputra'
- 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)
-
- varsetabove: '{somevar}'
- node: opnfv-build
+ name: 'vswitchperf-daily-{stream}'
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:
@@
-42,9
+36,6
@@
triggers:
- timed: 'H H * * *'
triggers:
- timed: 'H H * * *'
- prebuilders:
- - test-macro
-
builders:
- shell: |
pwd
builders:
- shell: |
pwd
@@
-54,16
+45,11
@@
# run basic sanity test
make sanity
# run basic sanity test
make sanity
- postbuilders:
- - test-macro
-
- job-template:
name: 'vswitchperf-verify-{stream}'
project-type: freestyle
- job-template:
name: 'vswitchperf-verify-{stream}'
project-type: freestyle
- node: opnfv-build
-
concurrent: true
properties:
concurrent: true
properties:
@@
-76,10
+62,9
@@
- project-parameter:
project: '{project}'
- gerrit-parameter:
- project-parameter:
project: '{project}'
- gerrit-parameter:
- branch: 'master'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/vswitchperf
+ branch: '{branch}'
+ - 'opnfv-build-defaults'
+
scm:
- gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
scm:
- gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
@@
-100,10
+85,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/**'
@@
-120,14
+105,8
@@
- 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
-
project-type: freestyle
project-type: freestyle
- node: opnfv-build
-
concurrent: true
properties:
concurrent: true
properties:
@@
-140,10
+119,8
@@
- project-parameter:
project: '{project}'
- gerrit-parameter:
- project-parameter:
project: '{project}'
- gerrit-parameter:
- branch: 'master'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/vswitchperf
+ branch: '{branch}'
+ - 'opnfv-build-defaults'
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
@@
-159,10
+136,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/**'