Skip to content

S
spring-boot
Commit 6029c8a4 authored by Madhura Bhave's avatar Madhura Bhave
Browse files
Options

Merge branch '2.2.x' 

Closes gh-19013
parents c8dfec4b 0d7f49f9
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
ci/pipeline.yml
View file @ 6029c8a4
......@@ -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:
......
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