root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch '2.1.x' into 2.2.x

Browse Source
pull/23053/head
Andy Wilkinson 4 years ago
parent 750777db24 25866019c9
commit 162253948a
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File

19
ci/pipeline.yml
Unescape Escape View File

@ -12,12 +12,13 @@ anchors:
GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key)) GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
GRADLE_ENTERPRISE_CACHE_USERNAME: ((gradle_enterprise_cache_user.username)) GRADLE_ENTERPRISE_CACHE_USERNAME: ((gradle_enterprise_cache_user.username))
GRADLE_ENTERPRISE_CACHE_PASSWORD: ((gradle_enterprise_cache_user.password)) GRADLE_ENTERPRISE_CACHE_PASSWORD: ((gradle_enterprise_cache_user.password))
BRANCH: ((branch))
CI: true
build-project-task-params: &build-project-task-params build-project-task-params: &build-project-task-params
privileged: true privileged: true
timeout: ((task-timeout)) timeout: ((task-timeout))
file: git-repo/ci/tasks/build-project.yml file: git-repo/ci/tasks/build-project.yml
params: params:
BRANCH: ((branch))
<<: *gradle-enterprise-task-params <<: *gradle-enterprise-task-params
github-task-params: &github-task-params github-task-params: &github-task-params
GITHUB_REPO: spring-boot GITHUB_REPO: spring-boot
@ -281,21 +282,18 @@ jobs:
file: git-repo/ci/tasks/build-smoke-tests.yml file: git-repo/ci/tasks/build-smoke-tests.yml
timeout: ((task-timeout)) timeout: ((task-timeout))
params: params:
BRANCH: ((branch))
<<: *gradle-enterprise-task-params <<: *gradle-enterprise-task-params
- task: build-integration-tests - 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
timeout: ((task-timeout)) timeout: ((task-timeout))
params: params:
BRANCH: ((branch))
<<: *gradle-enterprise-task-params <<: *gradle-enterprise-task-params
- task: build-deployment-tests - 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)) timeout: ((task-timeout))
params: params:
BRANCH: ((branch))
<<: *gradle-enterprise-task-params <<: *gradle-enterprise-task-params
on_failure: on_failure:
do: do:
@ -377,21 +375,18 @@ jobs:
file: git-repo/ci/tasks/build-smoke-tests.yml file: git-repo/ci/tasks/build-smoke-tests.yml
timeout: ((task-timeout)) timeout: ((task-timeout))
params: params:
BRANCH: ((branch))
<<: *gradle-enterprise-task-params <<: *gradle-enterprise-task-params
- task: build-integration-tests - 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
timeout: ((task-timeout)) timeout: ((task-timeout))
params: params:
BRANCH: ((branch))
<<: *gradle-enterprise-task-params <<: *gradle-enterprise-task-params
- task: build-deployment-tests - 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)) timeout: ((task-timeout))
params: params:
BRANCH: ((branch))
<<: *gradle-enterprise-task-params <<: *gradle-enterprise-task-params
on_failure: on_failure:
do: do:
@ -424,21 +419,18 @@ jobs:
image: spring-boot-jdk14-ci-image image: spring-boot-jdk14-ci-image
file: git-repo/ci/tasks/build-smoke-tests.yml file: git-repo/ci/tasks/build-smoke-tests.yml
params: params:
BRANCH: ((branch))
<<: *gradle-enterprise-task-params <<: *gradle-enterprise-task-params
- task: build-integration-tests - task: build-integration-tests
timeout: ((task-timeout)) timeout: ((task-timeout))
image: spring-boot-jdk14-ci-image image: spring-boot-jdk14-ci-image
file: git-repo/ci/tasks/build-integration-tests.yml file: git-repo/ci/tasks/build-integration-tests.yml
params: params:
BRANCH: ((branch))
<<: *gradle-enterprise-task-params <<: *gradle-enterprise-task-params
- task: build-deployment-tests - task: build-deployment-tests
timeout: ((task-timeout)) timeout: ((task-timeout))
image: spring-boot-jdk14-ci-image image: spring-boot-jdk14-ci-image
file: git-repo/ci/tasks/build-deployment-tests.yml file: git-repo/ci/tasks/build-deployment-tests.yml
params: params:
BRANCH: ((branch))
<<: *gradle-enterprise-task-params <<: *gradle-enterprise-task-params
on_failure: on_failure:
do: do:
@ -467,7 +459,6 @@ jobs:
- WIN64 - WIN64
timeout: ((task-timeout)) timeout: ((task-timeout))
params: params:
BRANCH: ((branch))
<<: *gradle-enterprise-task-params <<: *gradle-enterprise-task-params
on_failure: on_failure:
do: do:
@ -489,6 +480,8 @@ jobs:
params: params:
RELEASE_TYPE: M RELEASE_TYPE: M
GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key)) GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
BRANCH: ((branch))
CI: true
- put: artifactory-repo - put: artifactory-repo
params: params:
<<: *artifactory-repo-put-params <<: *artifactory-repo-put-params
@ -508,6 +501,8 @@ jobs:
params: params:
RELEASE_TYPE: RC RELEASE_TYPE: RC
GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key)) GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
BRANCH: ((branch))
CI: true
- put: artifactory-repo - put: artifactory-repo
params: params:
<<: *artifactory-repo-put-params <<: *artifactory-repo-put-params
@ -527,6 +522,8 @@ jobs:
params: params:
RELEASE_TYPE: RELEASE RELEASE_TYPE: RELEASE
GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key)) GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
BRANCH: ((branch))
CI: true
- put: artifactory-repo - put: artifactory-repo
params: params:
<<: *artifactory-repo-put-params <<: *artifactory-repo-put-params

Write Preview
Loading…
Cancel
Save