Merge branch '2.2.x' into 2.3.x

pull/22035/head
Phillip Webb 5 years ago
commit c34bcd496d

@ -48,6 +48,24 @@ anchors:
properties: properties:
"zip.type": "docs" "zip.type": "docs"
"zip.deployed": "false" "zip.deployed": "false"
slack-fail-params: &slack-fail-params
text: >
:concourse-failed: ${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!
[<https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|build log>]
[$TEXT_FILE_CONTENT]
text_file: git-repo/build/build-scan-uri.txt
silent: true
icon_emoji: ":concourse:"
username: concourse-ci
slack-success-params: &slack-success-params
text: >
:concourse-succeeded: ${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} was successful!
[<https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|build log>]
[$TEXT_FILE_CONTENT]
text_file: git-repo/build/build-scan-uri.txt
silent: true
icon_emoji: ":concourse:"
username: concourse-ci
resource_types: resource_types:
- name: artifactory-resource - name: artifactory-resource
type: docker-image type: docker-image
@ -267,14 +285,7 @@ jobs:
params: { state: "failure", commit: "git-repo" } params: { state: "failure", commit: "git-repo" }
- put: slack-alert - put: slack-alert
params: params:
text: > <<: *slack-fail-params
:concourse-failed: ${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!
[<https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|build log>]
[$TEXT_FILE_CONTENT]
text_file: git-repo/build/build-scan-uri.txt
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
@ -286,22 +297,10 @@ jobs:
do: do:
- put: slack-alert - put: slack-alert
params: params:
text: > <<: *slack-fail-params
:concourse-failed: ${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!
[<https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|build log>]
silent: true
icon_emoji: ":concourse:"
username: concourse-ci
- put: slack-alert - put: slack-alert
params: params:
text: > <<: *slack-success-params
:concourse-succeeded: ${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} was successful!
[<https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|build log>]
[$TEXT_FILE_CONTENT]
text_file: git-repo/build/build-scan-uri.txt
silent: true
icon_emoji: ":concourse:"
username: concourse-ci
- name: build-pull-requests - name: build-pull-requests
serial: true serial: true
public: true public: true
@ -349,26 +348,12 @@ jobs:
params: { state: "failure", commit: "git-repo" } params: { state: "failure", commit: "git-repo" }
- put: slack-alert - put: slack-alert
params: params:
text: > <<: *slack-fail-params
:concourse-failed: ${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!
[<https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|build log>]
[$TEXT_FILE_CONTENT]
text_file: git-repo/build/build-scan-uri.txt
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: > <<: *slack-success-params
:concourse-succeeded: ${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} was successful!
[<https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|build log>]
[$TEXT_FILE_CONTENT]
text_file: git-repo/build/build-scan-uri.txt
silent: true
icon_emoji: ":concourse:"
username: concourse-ci
- name: jdk14-build - name: jdk14-build
serial: true serial: true
public: true public: true
@ -388,26 +373,12 @@ jobs:
params: { state: "failure", commit: "git-repo" } params: { state: "failure", commit: "git-repo" }
- put: slack-alert - put: slack-alert
params: params:
text: > <<: *slack-fail-params
:concourse-failed: ${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!
[<https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|build log>]
[$TEXT_FILE_CONTENT]
text_file: git-repo/build/build-scan-uri.txt
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: > <<: *slack-success-params
:concourse-succeeded: ${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} was successful!
[<https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|build log>]
[$TEXT_FILE_CONTENT]
text_file: git-repo/build/build-scan-uri.txt
silent: true
icon_emoji: ":concourse:"
username: concourse-ci
- name: windows-build - name: windows-build
serial: true serial: true
plan: plan:
@ -431,24 +402,10 @@ jobs:
do: do:
- put: slack-alert - put: slack-alert
params: params:
text: > <<: *slack-fail-params
:concourse-failed: ${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!
[<https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|build log>]
[$TEXT_FILE_CONTENT]
text_file: git-repo/build/build-scan-uri.txt
silent: true
icon_emoji: ":concourse:"
username: concourse-ci
- put: slack-alert - put: slack-alert
params: params:
text: > <<: *slack-success-params
:concourse-succeeded: ${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} was successful!
[<https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|build log>]
[$TEXT_FILE_CONTENT]
text_file: git-repo/build/build-scan-uri.txt
silent: true
icon_emoji: ":concourse:"
username: concourse-ci
- name: stage-milestone - name: stage-milestone
serial: true serial: true
plan: plan:

Loading…
Cancel
Save