diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-01-17 23:51:25 +0100 |
|---|---|---|
| committer | Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-01-17 23:56:29 +0100 |
| commit | 287b69a6aa1e951e2daad44532a023bf843c1ab2 (patch) | |
| tree | 0d803548ceba7e350ca9f606906229ec79d4f5c1 /jjb/fuel/fuel-project-jobs.yml | |
| parent | 020165444629418473749ac2db3c4d1bd888ac3a (diff) | |
fuel: Merge deployment scripts for daily and virtual deployments
Change-Id: I84348614c2a03e7cca359e9f47d536d833328958
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb/fuel/fuel-project-jobs.yml')
| -rw-r--r-- | jjb/fuel/fuel-project-jobs.yml | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml index 95bc3a6b4..cedb4eee2 100644 --- a/jjb/fuel/fuel-project-jobs.yml +++ b/jjb/fuel/fuel-project-jobs.yml @@ -194,6 +194,10 @@ enabled: true max-total: 2 max-per-node: 1 + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'fuel-deploy-virtual-daily-.*' parameters: - project-parameter: @@ -214,25 +218,25 @@ - ssh-agent-credentials: users: '{ssh-credentials}' -# triggers: -# - gerrit: -# trigger-on: -# - change-merged-event -# - comment-added-contains-event: -# comment-contains-value: 'remerge' -# projects: -# - project-compare-type: 'ANT' -# project-pattern: '{project}' -# branches: -# - branch-compare-type: 'ANT' -# branch-pattern: '**/{branch}' -# dependency-jobs: 'fuel-merge-build-{stream}' + triggers: + - gerrit: + trigger-on: + - change-merged-event + - comment-added-contains-event: + comment-contains-value: 'remerge' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + dependency-jobs: 'fuel-merge-build-{stream}' builders: - shell: !include-raw-escape: ./fuel-download-artifact.sh - shell: - !include-raw-escape: ./fuel-deploy-virtual.sh + !include-raw-escape: ./fuel-deploy.sh - shell: !include-raw-escape: ./fuel-workspace-cleanup.sh |