summaryrefslogtreecommitdiffstats
path: root/jjb/fuel/fuel.yml
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/fuel/fuel.yml')
-rw-r--r--jjb/fuel/fuel.yml17
1 files changed, 11 insertions, 6 deletions
diff --git a/jjb/fuel/fuel.yml b/jjb/fuel/fuel.yml
index e809592fc..c0ba580de 100644
--- a/jjb/fuel/fuel.yml
+++ b/jjb/fuel/fuel.yml
@@ -12,7 +12,7 @@
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}'
@@ -64,7 +64,7 @@
wrappers:
- ssh-agent-credentials:
- user: '{ssh-credentials}'
+ users: '{ssh-credentials}'
- timeout:
timeout: 360
fail: true
@@ -87,6 +87,7 @@
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
+ readable-message: true
builders:
- shell:
@@ -130,7 +131,7 @@
wrappers:
- ssh-agent-credentials:
- user: '{ssh-credentials}'
+ users: '{ssh-credentials}'
- timeout:
timeout: 360
fail: true
@@ -157,11 +158,11 @@
!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
@@ -213,10 +214,14 @@
- 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
+ publishers:
+ - email:
+ recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com
+
- job-template:
name: 'fuel-daily-{stream}'