Commit 3fe4fb13 authored by Phillip Webb's avatar Phillip Webb

Merge branch '2.1.x' into 2.2.x

parents da09e227 418859fa
...@@ -46,6 +46,16 @@ anchors: ...@@ -46,6 +46,16 @@ anchors:
properties: properties:
"zip.type": "docs" "zip.type": "docs"
"zip.deployed": "false" "zip.deployed": "false"
slack-fail-params: &slack-fail-params
text: ":concourse-failed: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!>"
silent: true
icon_emoji: ":concourse:"
username: concourse-ci
slack-success-params: &slack-success-params
text: ":concourse-succeeded: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} was successful!>"
silent: true
icon_emoji: ":concourse:"
username: concourse-ci
resource_types: resource_types:
- name: artifactory-resource - name: artifactory-resource
type: docker-image type: docker-image
...@@ -278,10 +288,7 @@ jobs: ...@@ -278,10 +288,7 @@ jobs:
params: { state: "failure", commit: "git-repo" } params: { state: "failure", commit: "git-repo" }
- put: slack-alert - put: slack-alert
params: params:
text: ":concourse-failed: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!>" <<: *slack-fail-params
silent: true
icon_emoji: ":concourse:"
username: concourse-ci
- put: repo-status-build - put: repo-status-build
params: { state: "success", commit: "git-repo" } params: { state: "success", commit: "git-repo" }
- put: artifactory-repo - put: artifactory-repo
...@@ -291,16 +298,10 @@ jobs: ...@@ -291,16 +298,10 @@ jobs:
do: do:
- put: slack-alert - put: slack-alert
params: params:
text: ":concourse-failed: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!>" <<: *slack-fail-params
silent: true
icon_emoji: ":concourse:"
username: concourse-ci
- put: slack-alert - put: slack-alert
params: params:
text: ":concourse-succeeded: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} was successful!>" <<: *slack-success-params
silent: true
icon_emoji: ":concourse:"
username: concourse-ci
- name: build-pull-requests - name: build-pull-requests
serial: true serial: true
public: true public: true
...@@ -374,18 +375,12 @@ jobs: ...@@ -374,18 +375,12 @@ jobs:
params: { state: "failure", commit: "git-repo" } params: { state: "failure", commit: "git-repo" }
- put: slack-alert - put: slack-alert
params: params:
text: ":concourse-failed: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!>" <<: *slack-fail-params
silent: true
icon_emoji: ":concourse:"
username: concourse-ci
- put: repo-status-jdk11-build - put: repo-status-jdk11-build
params: { state: "success", commit: "git-repo" } params: { state: "success", commit: "git-repo" }
- put: slack-alert - put: slack-alert
params: params:
text: ":concourse-succeeded: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} was successful!>" <<: *slack-success-params
silent: true
icon_emoji: ":concourse:"
username: concourse-ci
- name: jdk14-build - name: jdk14-build
serial: true serial: true
public: true public: true
...@@ -420,18 +415,12 @@ jobs: ...@@ -420,18 +415,12 @@ jobs:
params: { state: "failure", commit: "git-repo" } params: { state: "failure", commit: "git-repo" }
- put: slack-alert - put: slack-alert
params: params:
text: ":concourse-failed: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!>" <<: *slack-fail-params
silent: true
icon_emoji: ":concourse:"
username: concourse-ci
- put: repo-status-jdk14-build - put: repo-status-jdk14-build
params: { state: "success", commit: "git-repo" } params: { state: "success", commit: "git-repo" }
- put: slack-alert - put: slack-alert
params: params:
text: ":concourse-succeeded: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} was successful!>" <<: *slack-success-params
silent: true
icon_emoji: ":concourse:"
username: concourse-ci
- name: windows-build - name: windows-build
serial: true serial: true
plan: plan:
...@@ -450,16 +439,10 @@ jobs: ...@@ -450,16 +439,10 @@ jobs:
do: do:
- put: slack-alert - put: slack-alert
params: params:
text: ":concourse-failed: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!>" <<: *slack-fail-params
silent: true
icon_emoji: ":concourse:"
username: concourse-ci
- put: slack-alert - put: slack-alert
params: params:
text: ":concourse-succeeded: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} was successful!>" <<: *slack-success-params
silent: true
icon_emoji: ":concourse:"
username: concourse-ci
- name: stage-milestone - name: stage-milestone
serial: true serial: true
plan: plan:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment