Merge branch '2.1.x' into 2.2.x

pull/22022/head
Phillip Webb 5 years ago
commit da09e227c7

@ -205,27 +205,23 @@ jobs:
- get: spring-boot-ci-image - get: spring-boot-ci-image
- in_parallel: - in_parallel:
- task: detect-jdk8-update - task: detect-jdk8-update
image: spring-boot-ci-image
file: git-repo/ci/tasks/detect-jdk-updates.yml file: git-repo/ci/tasks/detect-jdk-updates.yml
params: params:
<<: *github-task-params <<: *github-task-params
JDK_VERSION: java8 JDK_VERSION: java8
image: spring-boot-ci-image
- task: detect-jdk11-update - task: detect-jdk11-update
image: spring-boot-ci-image
file: git-repo/ci/tasks/detect-jdk-updates.yml file: git-repo/ci/tasks/detect-jdk-updates.yml
params: params:
<<: *github-task-params <<: *github-task-params
JDK_VERSION: java11 JDK_VERSION: java11
image: spring-boot-ci-image
- task: detect-jdk14-update - task: detect-jdk14-update
image: spring-boot-ci-image
file: git-repo/ci/tasks/detect-jdk-updates.yml file: git-repo/ci/tasks/detect-jdk-updates.yml
params: params:
GITHUB_REPO: spring-boot <<: *github-task-params
GITHUB_ORGANIZATION: spring-projects
GITHUB_PASSWORD: ((github-password))
GITHUB_USERNAME: ((github-username))
JDK_VERSION: java14 JDK_VERSION: java14
MILESTONE: ((milestone))
image: spring-boot-ci-image
- name: detect-ubuntu-image-updates - name: detect-ubuntu-image-updates
plan: plan:
- get: git-repo - get: git-repo
@ -234,10 +230,10 @@ jobs:
- get: spring-boot-ci-image - get: spring-boot-ci-image
- do: - do:
- task: detect-ubuntu-image-updates - task: detect-ubuntu-image-updates
image: spring-boot-ci-image
file: git-repo/ci/tasks/detect-ubuntu-image-updates.yml file: git-repo/ci/tasks/detect-ubuntu-image-updates.yml
params: params:
<<: *github-task-params <<: *github-task-params
image: spring-boot-ci-image
- name: detect-docker-updates - name: detect-docker-updates
plan: plan:
- get: git-repo - get: git-repo
@ -246,10 +242,10 @@ jobs:
- get: spring-boot-ci-image - get: spring-boot-ci-image
- do: - do:
- task: detect-docker-updates - task: detect-docker-updates
image: spring-boot-ci-image
file: git-repo/ci/tasks/detect-docker-updates.yml file: git-repo/ci/tasks/detect-docker-updates.yml
params: params:
<<: *github-task-params <<: *github-task-params
image: spring-boot-ci-image
- name: build - name: build
serial: true serial: true
public: true public: true
@ -261,21 +257,21 @@ jobs:
params: { state: "pending", commit: "git-repo" } params: { state: "pending", commit: "git-repo" }
- do: - do:
- task: build-project - task: build-project
<<: *build-project-task-params
image: spring-boot-ci-image image: spring-boot-ci-image
<<: *build-project-task-params
- in_parallel: - in_parallel:
- task: build-smoke-tests - task: build-smoke-tests
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
timeout: ((task-timeout)) timeout: ((task-timeout))
- task: build-integration-tests
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
timeout: ((task-timeout)) timeout: ((task-timeout))
- task: build-deployment-tests
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
timeout: ((task-timeout))
on_failure: on_failure:
do: do:
- put: repo-status-build - put: repo-status-build
@ -320,22 +316,22 @@ jobs:
path: git-repo path: git-repo
status: pending status: pending
- task: build-project - task: build-project
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
timeout: ((task-timeout))
- in_parallel: - in_parallel:
- task: build-smoke-tests - task: build-smoke-tests
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
timeout: ((task-timeout)) timeout: ((task-timeout))
- task: build-integration-tests
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
timeout: ((task-timeout)) timeout: ((task-timeout))
- task: build-deployment-tests
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
timeout: ((task-timeout))
on_success: on_success:
put: git-pull-request put: git-pull-request
params: params:
@ -357,21 +353,21 @@ jobs:
params: { state: "pending", commit: "git-repo" } params: { state: "pending", commit: "git-repo" }
- do: - do:
- task: build-project - task: build-project
<<: *build-project-task-params
image: spring-boot-jdk11-ci-image image: spring-boot-jdk11-ci-image
<<: *build-project-task-params
- in_parallel: - in_parallel:
- task: build-smoke-tests - task: build-smoke-tests
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
timeout: ((task-timeout)) timeout: ((task-timeout))
- task: build-integration-tests
image: spring-boot-jdk11-ci-image image: spring-boot-jdk11-ci-image
file: git-repo/ci/tasks/build-integration-tests.yml file: git-repo/ci/tasks/build-integration-tests.yml
- task: build-deployment-tests
timeout: ((task-timeout)) timeout: ((task-timeout))
- task: build-deployment-tests
image: spring-boot-jdk11-ci-image image: spring-boot-jdk11-ci-image
file: git-repo/ci/tasks/build-deployment-tests.yml file: git-repo/ci/tasks/build-deployment-tests.yml
timeout: ((task-timeout))
on_failure: on_failure:
do: do:
- put: repo-status-jdk11-build - put: repo-status-jdk11-build

Loading…
Cancel
Save