Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
merge GIT_BRANCH and GERRIT_BRANCH into BRANCH
[releng.git]
/
jjb
/
fuel
/
fuel-project-jobs.yml
diff --git
a/jjb/fuel/fuel-project-jobs.yml
b/jjb/fuel/fuel-project-jobs.yml
index
c160fb8
..
32ad890
100644
(file)
--- a/
jjb/fuel/fuel-project-jobs.yml
+++ b/
jjb/fuel/fuel-project-jobs.yml
@@
-13,10
+13,10
@@
branch: '{stream}'
gs-pathname: ''
disabled: false
branch: '{stream}'
gs-pathname: ''
disabled: false
- -
brahmaputra
:
+ -
danube
:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
- disabled:
fals
e
+ disabled:
tru
e
jobs:
- 'fuel-build-daily-{stream}'
jobs:
- 'fuel-build-daily-{stream}'
@@
-30,9
+30,12
@@
- job-template:
name: 'fuel-build-daily-{stream}'
- job-template:
name: 'fuel-build-daily-{stream}'
+ disabled: '{obj:disabled}'
+
concurrent: false
properties:
concurrent: false
properties:
+ - logrotate-default
- throttle:
enabled: true
max-total: 1
- throttle:
enabled: true
max-total: 1
@@
-42,6
+45,7
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
+ branch: '{branch}'
- 'opnfv-build-ubuntu-defaults'
- '{installer}-defaults'
- choice:
- 'opnfv-build-ubuntu-defaults'
- '{installer}-defaults'
- choice:
@@
-54,10
+58,7
@@
gs-pathname: '{gs-pathname}'
scm:
gs-pathname: '{gs-pathname}'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
triggers:
- timed: '0 H/4 * * *'
triggers:
- timed: '0 H/4 * * *'
@@
-77,7
+78,7
@@
publishers:
- email:
publishers:
- email:
- recipients:
jonas.bjurel@ericsson.com stefan.k.berg@ericsson
.com
+ recipients:
fzhadaev@mirantis
.com
- job-template:
name: 'fuel-merge-build-{stream}'
- job-template:
name: 'fuel-merge-build-{stream}'
@@
-89,7
+90,6
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
- - gerrit-parameter:
branch: '{branch}'
- 'opnfv-build-ubuntu-defaults'
- '{installer}-defaults'
branch: '{branch}'
- 'opnfv-build-ubuntu-defaults'
- '{installer}-defaults'
@@
-97,21
+97,17
@@
gs-pathname: '{gs-pathname}'
scm:
gs-pathname: '{gs-pathname}'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
+ - git-scm
wrappers:
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 360
fail: true
triggers:
- gerrit:
- timeout:
timeout: 360
fail: true
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:
@@
-149,6
+145,7
@@
concurrent: true
properties:
concurrent: true
properties:
+ - logrotate-default
- throttle:
enabled: true
max-total: 2
- throttle:
enabled: true
max-total: 2
@@
-164,7
+161,6
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
- - gerrit-parameter:
branch: '{branch}'
- 'fuel-virtual-defaults':
installer: '{installer}'
branch: '{branch}'
- 'fuel-virtual-defaults':
installer: '{installer}'
@@
-172,18
+168,14
@@
- fuel-project-parameter:
gs-pathname: '{gs-pathname}'
scm:
- fuel-project-parameter:
gs-pathname: '{gs-pathname}'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
+ - git-scm
wrappers:
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
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:
@@
-216,16
+208,17
@@
publishers:
- email:
publishers:
- email:
- recipients:
jonas.bjurel@ericsson.com stefan.k.berg@ericsson
.com
+ recipients:
fzhadaev@mirantis
.com
- job-template:
name: 'fuel-deploy-generic-daily-{stream}'
concurrent: true
- job-template:
name: 'fuel-deploy-generic-daily-{stream}'
concurrent: true
- disabled:
false
+ disabled:
'{obj:disabled}'
properties:
properties:
+ - logrotate-default
- throttle:
enabled: true
max-per-node: 1
- throttle:
enabled: true
max-per-node: 1
@@
-240,6
+233,7
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
+ branch: '{branch}'
- '{installer}-defaults'
- string:
name: GIT_BASE
- '{installer}-defaults'
- string:
name: GIT_BASE
@@
-261,10
+255,7
@@
gs-pathname: '{gs-pathname}'
scm:
gs-pathname: '{gs-pathname}'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
wrappers:
- build-name:
wrappers:
- build-name: