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 "update builder script and how-to-use-docs"
[releng.git]
/
jjb
/
fuel
/
fuel.yml
diff --git
a/jjb/fuel/fuel.yml
b/jjb/fuel/fuel.yml
index
e809592
..
1566109
100644
(file)
--- a/
jjb/fuel/fuel.yml
+++ b/
jjb/fuel/fuel.yml
@@
-12,7
+12,7
@@
jobs:
- 'fuel-verify-build-{stream}'
- 'fuel-merge-build-{stream}'
jobs:
- 'fuel-verify-build-{stream}'
- 'fuel-merge-build-{stream}'
- - 'fuel-merge-
virtual-deploy
-{stream}'
+ - 'fuel-merge-
deploy-virtual
-{stream}'
- 'fuel-daily-{stream}'
- 'fuel-build-{stream}'
- 'fuel-deploy-{stream}'
- 'fuel-daily-{stream}'
- 'fuel-build-{stream}'
- 'fuel-deploy-{stream}'
@@
-30,8
+30,6
@@
- job-template:
name: 'fuel-verify-build-{stream}'
- job-template:
name: 'fuel-verify-build-{stream}'
- project-type: freestyle
-
node: ericsson-build
concurrent: true
node: ericsson-build
concurrent: true
@@
-64,7
+62,7
@@
wrappers:
- ssh-agent-credentials:
wrappers:
- ssh-agent-credentials:
- user: '{ssh-credentials}'
+ user
s
: '{ssh-credentials}'
- timeout:
timeout: 360
fail: true
- timeout:
timeout: 360
fail: true
@@
-87,6
+85,7
@@
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
+ readable-message: true
builders:
- shell:
builders:
- shell:
@@
-97,8
+96,6
@@
- job-template:
name: 'fuel-merge-build-{stream}'
- job-template:
name: 'fuel-merge-build-{stream}'
- project-type: freestyle
-
node: ericsson-build
concurrent: true
node: ericsson-build
concurrent: true
@@
-130,7
+127,7
@@
wrappers:
- ssh-agent-credentials:
wrappers:
- ssh-agent-credentials:
- user: '{ssh-credentials}'
+ user
s
: '{ssh-credentials}'
- timeout:
timeout: 360
fail: true
- timeout:
timeout: 360
fail: true
@@
-157,11
+154,9
@@
!include-raw ./fuel-workspace-cleanup.sh
- job-template:
!include-raw ./fuel-workspace-cleanup.sh
- job-template:
- name: 'fuel-merge-
virtual-deploy
-{stream}'
+ name: 'fuel-merge-
deploy-virtual
-{stream}'
- project-type: freestyle
-
- node: ericsson-build
+ node: fuel-deploy-virtual
concurrent: true
concurrent: true
@@
-213,15
+208,17
@@
- shell:
!include-raw ./fuel-download-artifact.sh
- shell:
- shell:
!include-raw ./fuel-download-artifact.sh
- shell:
- !include-raw ./fuel-
virtual-deploy
.sh
+ !include-raw ./fuel-
deploy-virtual
.sh
- shell:
!include-raw ./fuel-workspace-cleanup.sh
- shell:
!include-raw ./fuel-workspace-cleanup.sh
+ publishers:
+ - email:
+ recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com
+
- job-template:
name: 'fuel-daily-{stream}'
- job-template:
name: 'fuel-daily-{stream}'
- project-type: freestyle
-
node: ericsson-build
disabled: false
node: ericsson-build
disabled: false
@@
-278,8
+275,6
@@
- job-template:
name: 'fuel-build-{stream}'
- job-template:
name: 'fuel-build-{stream}'
- project-type: freestyle
-
node: ericsson-build
logrotate:
node: ericsson-build
logrotate:
@@
-321,8
+316,6
@@
- job-template:
name: 'fuel-deploy-{stream}'
- job-template:
name: 'fuel-deploy-{stream}'
- project-type: freestyle
-
disabled: false
node: opnfv-jump-2
disabled: false
node: opnfv-jump-2
@@
-363,12
+356,8
@@
- job-template:
name: 'fuel-lab-reconfig-{stream}'
- job-template:
name: 'fuel-lab-reconfig-{stream}'
- project-type: freestyle
-
disabled: true
disabled: true
- node: master
-
logrotate:
daysToKeep: 30
numToKeep: 10
logrotate:
daysToKeep: 30
numToKeep: 10