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' into 2.2.x 

Closes gh-19012
This commit is contained in:
Madhura Bhave 2019-11-13 15:34:16 -08:00
parent b6ff0b7c5f 8af63dc42e
commit 0d7f49f91f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ci/pipeline.yml
View File

@ -326,11 +326,11 @@ jobs:
image: spring-boot-jdk11-ci-image
file: git-repo/ci/tasks/build-smoke-tests.yml
- task: build-integration-tests
timeout: 1h30m
timeout: ((task-timeout))
image: spring-boot-jdk11-ci-image
file: git-repo/ci/tasks/build-integration-tests.yml
- task: build-deployment-tests
timeout: 1h30m
timeout: ((task-timeout))
image: spring-boot-jdk11-ci-image
file: git-repo/ci/tasks/build-deployment-tests.yml
on_failure:
@ -363,20 +363,20 @@ jobs:
- do:
- task: build-project
privileged: true
timeout: 1h30m
timeout: ((task-timeout))
image: spring-boot-jdk13-ci-image
file: git-repo/ci/tasks/build-project.yml
- in_parallel:
- task: build-smoke-tests
timeout: 1h30m
timeout: ((task-timeout))
image: spring-boot-jdk13-ci-image
file: git-repo/ci/tasks/build-smoke-tests.yml
- task: build-integration-tests
timeout: 1h30m
timeout: ((task-timeout))
image: spring-boot-jdk13-ci-image
file: git-repo/ci/tasks/build-integration-tests.yml
- task: build-deployment-tests
timeout: 1h30m
timeout: ((task-timeout))
image: spring-boot-jdk13-ci-image
file: git-repo/ci/tasks/build-deployment-tests.yml
on_failure: