diff options
Diffstat (limited to 'jjb/fuel/fuel.yml')
-rw-r--r-- | jjb/fuel/fuel.yml | 101 |
1 files changed, 17 insertions, 84 deletions
diff --git a/jjb/fuel/fuel.yml b/jjb/fuel/fuel.yml index 1f53454e3..60a69c682 100644 --- a/jjb/fuel/fuel.yml +++ b/jjb/fuel/fuel.yml @@ -11,9 +11,8 @@ jobs: - 'fuel-verify-build-{stream}' - - 'fuel-verify-virtual-deploy-{stream}' - 'fuel-merge-build-{stream}' - - 'fuel-merge-virtual-deploy-{stream}' + - 'fuel-merge-deploy-virtual-{stream}' - 'fuel-daily-{stream}' - 'fuel-build-{stream}' - 'fuel-deploy-{stream}' @@ -92,78 +91,8 @@ builders: - shell: !include-raw ./fuel-build.sh -# - shell: -# !include-raw ./fuel-upload-artifact.sh -# - shell: -# !include-raw ./fuel-workspace-cleanup.sh - -- job-template: - name: 'fuel-verify-virtual-deploy-{stream}' - - project-type: freestyle - - node: ericsson-build - - concurrent: true - - properties: - - throttle: - enabled: true - max-total: 2 - max-per-node: 1 - - logrotate: - daysToKeep: 30 - numToKeep: 10 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{branch}' - - fuel-parameter: - installer: '{installer}' - gs-pathname: '{gs-pathname}' - - scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - - wrappers: - - ssh-agent-credentials: - user: '{ssh-credentials}' - - triggers: - - gerrit: - trigger-on: - - patchset-created-event: - exclude-drafts: 'false' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' - - draft-published-event - - comment-added-contains-event: - comment-contains-value: 'recheck' - - comment-added-contains-event: - comment-contains-value: 'reverify' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - dependency-jobs: 'fuel-verify-build-{stream}' - - builders: -# - shell: -# !include-raw ./fuel-download-artifact.sh - shell: - !include-raw ./fuel-virtual-deploy.sh -# - shell: -# !include-raw ./fuel-workspace-cleanup.sh + !include-raw ./fuel-workspace-cleanup.sh - job-template: name: 'fuel-merge-build-{stream}' @@ -222,17 +151,17 @@ builders: - shell: !include-raw ./fuel-build.sh -# - shell: -# !include-raw ./fuel-upload-artifact.sh -# - shell: -# !include-raw ./fuel-workspace-cleanup.sh + - shell: + !include-raw ./fuel-upload-artifact.sh + - shell: + !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 @@ -281,12 +210,16 @@ dependency-jobs: 'fuel-merge-build-{stream}' builders: -# - shell: -# !include-raw ./fuel-download-artifact.sh - shell: - !include-raw ./fuel-virtual-deploy.sh -# - shell: -# !include-raw ./fuel-workspace-cleanup.sh + !include-raw ./fuel-download-artifact.sh + - shell: + !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}' |