Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Cleanup slave parameters
[releng.git]
/
jjb
/
conductor
/
conductor.yml
diff --git
a/jjb/conductor/conductor.yml
b/jjb/conductor/conductor.yml
index
961bcd8
..
247f4f2
100644
(file)
--- a/
jjb/conductor/conductor.yml
+++ b/
jjb/conductor/conductor.yml
@@
-10,31
+10,23
@@
jobs:
- 'conductor-verify-{stream}'
jobs:
- 'conductor-verify-{stream}'
-# only master branch is enabled at the moment to keep no of jobs sane
stream:
- master:
stream:
- master:
- branch: '
master
'
+ branch: '
{stream}
'
gs-pathname: ''
gs-pathname: ''
-
# - stable-
brahmaputra:
-
# branch: 'stable/brahmaputra
'
-
# gs-pathname: '/brahmaputra
'
+
-
brahmaputra:
+
branch: 'stable/{stream}
'
+
gs-pathname: '/{stream}
'
-- job
_defaults: &conductor_job_defaults
- name:
conductor_job_defaults
+- job
-template:
+ name:
'conductor-verify-{stream}'
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
- branch: '{stream}'
-
-- job-template:
- name: 'conductor-verify-{stream}'
-
- <<: *conductor_job_defaults
-
- parameters:
- - 'opnfv-build-defaults'
+ branch: '{branch}'
+ - 'opnfv-build-ubuntu-defaults'
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
@@
-59,7
+51,7
@@
project-pattern: '{project}'
branches:
- branch-compare-type: 'ANT'
project-pattern: '{project}'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/{
stream
}'
+ branch-pattern: '**/{
branch
}'
forbidden-file-paths:
- compare-type: ANT
pattern: 'docs/**|.gitignore'
forbidden-file-paths:
- compare-type: ANT
pattern: 'docs/**|.gitignore'