Skip to content

S
spring-boot
Commit bd815f6b authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Merge branch '2.0.x' into 2.1.x

parents 96235ea6 e26777c0
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 15 deletions
ci/parameters.yml
View file @ bd815f6b
...@@ -11,3 +11,4 @@ pipeline-name: "spring-boot-2.1.x" ...@@ -11,3 +11,4 @@ pipeline-name: "spring-boot-2.1.x"
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
ci/pipeline.yml
View file @ bd815f6b
...@@ -202,20 +202,20 @@ jobs: ...@@ -202,20 +202,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-samples - task: build-samples
timeout: 1h30m timeout: ((task-timeout))
image: spring-boot-ci-image image: spring-boot-ci-image
file: git-repo/ci/tasks/build-samples.yml file: git-repo/ci/tasks/build-samples.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:
...@@ -274,20 +274,20 @@ jobs: ...@@ -274,20 +274,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-samples - task: build-samples
timeout: 1h30m timeout: ((task-timeout))
image: spring-boot-ci-image image: spring-boot-ci-image
file: git-repo/ci/tasks/build-samples.yml file: git-repo/ci/tasks/build-samples.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:
...@@ -312,12 +312,12 @@ jobs: ...@@ -312,12 +312,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-samples - task: build-samples
timeout: 1h30m timeout: ((task-timeout))
image: spring-boot-jdk11-ci-image image: spring-boot-jdk11-ci-image
file: git-repo/ci/tasks/build-samples.yml file: git-repo/ci/tasks/build-samples.yml
- task: build-integration-tests - task: build-integration-tests
...@@ -358,20 +358,20 @@ jobs: ...@@ -358,20 +358,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-samples - task: build-samples
timeout: 1h30m timeout: ((task-timeout))
image: spring-boot-jdk12-ci-image image: spring-boot-jdk12-ci-image
file: git-repo/ci/tasks/build-samples.yml file: git-repo/ci/tasks/build-samples.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:
...@@ -405,7 +405,7 @@ jobs: ...@@ -405,7 +405,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
......
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