Commit 6215052c authored by Andy Wilkinson's avatar Andy Wilkinson

Polish integration of Gradle Enterprise in CI builds

parent d435c19a
...@@ -8,10 +8,16 @@ anchors: ...@@ -8,10 +8,16 @@ anchors:
username: ((docker-hub-username)) username: ((docker-hub-username))
password: ((docker-hub-password)) password: ((docker-hub-password))
tag: ((milestone)) tag: ((milestone))
gradle-enterprise-task-params: &gradle-enterprise-task-params
GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
GRADLE_ENTERPRISE_CACHE_USERNAME: ((gradle_enterprise_cache_user.username))
GRADLE_ENTERPRISE_CACHE_PASSWORD: ((gradle_enterprise_cache_user.password))
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:
<<: *gradle-enterprise-task-params
github-task-params: &github-task-params github-task-params: &github-task-params
GITHUB_REPO: spring-boot GITHUB_REPO: spring-boot
GITHUB_ORGANIZATION: spring-projects GITHUB_ORGANIZATION: spring-projects
...@@ -245,14 +251,20 @@ jobs: ...@@ -245,14 +251,20 @@ jobs:
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
timeout: ((task-timeout)) timeout: ((task-timeout))
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:
<<: *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:
<<: *gradle-enterprise-task-params
on_failure: on_failure:
do: do:
- put: repo-status-build - put: repo-status-build
...@@ -332,14 +344,20 @@ jobs: ...@@ -332,14 +344,20 @@ jobs:
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
timeout: ((task-timeout)) timeout: ((task-timeout))
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:
<<: *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:
<<: *gradle-enterprise-task-params
on_failure: on_failure:
do: do:
- put: repo-status-jdk11-build - put: repo-status-jdk11-build
...@@ -366,6 +384,8 @@ jobs: ...@@ -366,6 +384,8 @@ jobs:
tags: tags:
- WIN64 - WIN64
timeout: ((task-timeout)) timeout: ((task-timeout))
params:
<<: *gradle-enterprise-task-params
on_failure: on_failure:
do: do:
- put: slack-alert - put: slack-alert
...@@ -385,6 +405,7 @@ jobs: ...@@ -385,6 +405,7 @@ jobs:
file: git-repo/ci/tasks/stage.yml file: git-repo/ci/tasks/stage.yml
params: params:
RELEASE_TYPE: M RELEASE_TYPE: M
GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
- put: artifactory-repo - put: artifactory-repo
params: params:
<<: *artifactory-repo-put-params <<: *artifactory-repo-put-params
...@@ -403,6 +424,7 @@ jobs: ...@@ -403,6 +424,7 @@ jobs:
file: git-repo/ci/tasks/stage.yml file: git-repo/ci/tasks/stage.yml
params: params:
RELEASE_TYPE: RC RELEASE_TYPE: RC
GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
- put: artifactory-repo - put: artifactory-repo
params: params:
<<: *artifactory-repo-put-params <<: *artifactory-repo-put-params
...@@ -421,6 +443,7 @@ jobs: ...@@ -421,6 +443,7 @@ jobs:
file: git-repo/ci/tasks/stage.yml file: git-repo/ci/tasks/stage.yml
params: params:
RELEASE_TYPE: RELEASE RELEASE_TYPE: RELEASE
GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
- put: artifactory-repo - put: artifactory-repo
params: params:
<<: *artifactory-repo-put-params <<: *artifactory-repo-put-params
......
...@@ -5,6 +5,6 @@ source $(dirname $0)/common.sh ...@@ -5,6 +5,6 @@ source $(dirname $0)/common.sh
repository=$(pwd)/distribution-repository repository=$(pwd)/distribution-repository
pushd git-repo > /dev/null pushd git-repo > /dev/null
run_maven -N clean verify run_maven -N clean verify -Dscan=false
run_maven -f spring-boot-project/pom.xml clean deploy -U -Dfull -DaltDeploymentRepository=distribution::default::file://${repository} run_maven -f spring-boot-project/pom.xml clean deploy -U -Dfull -DaltDeploymentRepository=distribution::default::file://${repository}
popd > /dev/null popd > /dev/null
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