root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.1.x'

This commit is contained in:
Phillip Webb 2019-08-01 10:52:10 +01:00
parent 34c31ce099 bd815f6b5a
commit f8d4d3dd98
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ci/parameters.yml
View File

@ -11,3 +11,4 @@ pipeline-name: "spring-boot"
concourse-url: "https://ci.spring.io" concourse-url: "https://ci.spring.io"
bintray-subject: "spring" bintray-subject: "spring"
bintray-repo: "jars" bintray-repo: "jars"
task-timeout: 2h00m

30
ci/pipeline.yml
View File

@ -224,20 +224,20 @@ jobs:
- do: - do:
- task: build-project - task: build-project
privileged: true privileged: true
timeout: 1h30m timeout: ((task-timeout))
image: spring-boot-ci-image image: spring-boot-ci-image
file: git-repo/ci/tasks/build-project.yml file: git-repo/ci/tasks/build-project.yml
- in_parallel: - in_parallel:
- task: build-smoke-tests - task: build-smoke-tests
timeout: 1h30m timeout: ((task-timeout))
image: spring-boot-ci-image image: spring-boot-ci-image
file: git-repo/ci/tasks/build-smoke-tests.yml file: git-repo/ci/tasks/build-smoke-tests.yml
- task: build-integration-tests - task: build-integration-tests
timeout: 1h30m timeout: ((task-timeout))
image: spring-boot-ci-image image: spring-boot-ci-image
file: git-repo/ci/tasks/build-integration-tests.yml file: git-repo/ci/tasks/build-integration-tests.yml
- task: build-deployment-tests - task: build-deployment-tests
timeout: 1h30m timeout: ((task-timeout))
image: spring-boot-ci-image image: spring-boot-ci-image
file: git-repo/ci/tasks/build-deployment-tests.yml file: git-repo/ci/tasks/build-deployment-tests.yml
on_failure: on_failure:
@ -298,20 +298,20 @@ jobs:
path: git-repo path: git-repo
status: pending status: pending
- task: build-project - task: build-project
timeout: 1h30m timeout: ((task-timeout))
image: spring-boot-ci-image image: spring-boot-ci-image
file: git-repo/ci/tasks/build-pr-project.yml file: git-repo/ci/tasks/build-pr-project.yml
- in_parallel: - in_parallel:
- task: build-smoke-tests - task: build-smoke-tests
timeout: 1h30m timeout: ((task-timeout))
image: spring-boot-ci-image image: spring-boot-ci-image
file: git-repo/ci/tasks/build-smoke-tests.yml file: git-repo/ci/tasks/build-smoke-tests.yml
- task: build-integration-tests - task: build-integration-tests
timeout: 1h30m timeout: ((task-timeout))
image: spring-boot-ci-image image: spring-boot-ci-image
file: git-repo/ci/tasks/build-integration-tests.yml file: git-repo/ci/tasks/build-integration-tests.yml
- task: build-deployment-tests - task: build-deployment-tests
timeout: 1h30m timeout: ((task-timeout))
image: spring-boot-ci-image image: spring-boot-ci-image
file: git-repo/ci/tasks/build-deployment-tests.yml file: git-repo/ci/tasks/build-deployment-tests.yml
on_success: on_success:
@ -336,12 +336,12 @@ jobs:
- do: - do:
- task: build-project - task: build-project
privileged: true privileged: true
timeout: 1h30m timeout: ((task-timeout))
image: spring-boot-jdk11-ci-image image: spring-boot-jdk11-ci-image
file: git-repo/ci/tasks/build-project.yml file: git-repo/ci/tasks/build-project.yml
- in_parallel: - in_parallel:
- task: build-smoke-tests - task: build-smoke-tests
timeout: 1h30m timeout: ((task-timeout))
image: spring-boot-jdk11-ci-image image: spring-boot-jdk11-ci-image
file: git-repo/ci/tasks/build-smoke-tests.yml file: git-repo/ci/tasks/build-smoke-tests.yml
- task: build-integration-tests - task: build-integration-tests
@ -382,20 +382,20 @@ jobs:
- do: - do:
- task: build-project - task: build-project
privileged: true privileged: true
timeout: 1h30m timeout: ((task-timeout))
image: spring-boot-jdk12-ci-image image: spring-boot-jdk12-ci-image
file: git-repo/ci/tasks/build-project.yml file: git-repo/ci/tasks/build-project.yml
- in_parallel: - in_parallel:
- task: build-smoke-tests - task: build-smoke-tests
timeout: 1h30m timeout: ((task-timeout))
image: spring-boot-jdk12-ci-image image: spring-boot-jdk12-ci-image
file: git-repo/ci/tasks/build-smoke-tests.yml file: git-repo/ci/tasks/build-smoke-tests.yml
- task: build-integration-tests - task: build-integration-tests
timeout: 1h30m timeout: ((task-timeout))
image: spring-boot-jdk12-ci-image image: spring-boot-jdk12-ci-image
file: git-repo/ci/tasks/build-integration-tests.yml file: git-repo/ci/tasks/build-integration-tests.yml
- task: build-deployment-tests - task: build-deployment-tests
timeout: 1h30m timeout: ((task-timeout))
image: spring-boot-jdk12-ci-image image: spring-boot-jdk12-ci-image
file: git-repo/ci/tasks/build-deployment-tests.yml file: git-repo/ci/tasks/build-deployment-tests.yml
on_failure: on_failure:
@ -475,7 +475,7 @@ jobs:
file: git-repo/ci/tasks/build-project-windows.yml file: git-repo/ci/tasks/build-project-windows.yml
tags: tags:
- WIN64 - WIN64
timeout: 1h30m timeout: ((task-timeout))
on_failure: on_failure:
do: do:
- put: slack-alert - put: slack-alert