From 6215052c5b15e749ba9ec877bc2109f4e4f87a4c Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Fri, 24 Jul 2020 12:53:41 +0100
Subject: [PATCH] Polish integration of Gradle Enterprise in CI builds

---
 ci/pipeline.yml             | 23 +++++++++++++++++++++++
 ci/scripts/build-project.sh |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index b18c14f904..f83240878e 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -8,10 +8,16 @@ anchors:
     username: ((docker-hub-username))
     password: ((docker-hub-password))
     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
     privileged: true
     timeout: ((task-timeout))
     file: git-repo/ci/tasks/build-project.yml
+    params:
+      <<: *gradle-enterprise-task-params
   github-task-params: &github-task-params
     GITHUB_REPO: spring-boot
     GITHUB_ORGANIZATION: spring-projects
@@ -245,14 +251,20 @@ jobs:
         image: spring-boot-ci-image
         file: git-repo/ci/tasks/build-samples.yml
         timeout: ((task-timeout))
+        params:
+          <<: *gradle-enterprise-task-params
       - task: build-integration-tests
         image: spring-boot-ci-image
         file: git-repo/ci/tasks/build-integration-tests.yml
         timeout: ((task-timeout))
+        params:
+          <<: *gradle-enterprise-task-params
       - task: build-deployment-tests
         image: spring-boot-ci-image
         file: git-repo/ci/tasks/build-deployment-tests.yml
         timeout: ((task-timeout))
+        params:
+          <<: *gradle-enterprise-task-params
     on_failure:
       do:
       - put: repo-status-build
@@ -332,14 +344,20 @@ jobs:
         image: spring-boot-jdk11-ci-image
         file: git-repo/ci/tasks/build-samples.yml
         timeout: ((task-timeout))
+        params:
+          <<: *gradle-enterprise-task-params
       - task: build-integration-tests
         image: spring-boot-jdk11-ci-image
         file: git-repo/ci/tasks/build-integration-tests.yml
         timeout: ((task-timeout))
+        params:
+          <<: *gradle-enterprise-task-params
       - task: build-deployment-tests
         image: spring-boot-jdk11-ci-image
         file: git-repo/ci/tasks/build-deployment-tests.yml
         timeout: ((task-timeout))
+        params:
+          <<: *gradle-enterprise-task-params
     on_failure:
       do:
       - put: repo-status-jdk11-build
@@ -366,6 +384,8 @@ jobs:
         tags:
         - WIN64
         timeout: ((task-timeout))
+        params:
+          <<: *gradle-enterprise-task-params
       on_failure:
         do:
           - put: slack-alert
@@ -385,6 +405,7 @@ jobs:
     file: git-repo/ci/tasks/stage.yml
     params:
       RELEASE_TYPE: M
+      GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
   - put: artifactory-repo
     params:
       <<: *artifactory-repo-put-params
@@ -403,6 +424,7 @@ jobs:
     file: git-repo/ci/tasks/stage.yml
     params:
       RELEASE_TYPE: RC
+      GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
   - put: artifactory-repo
     params:
       <<: *artifactory-repo-put-params
@@ -421,6 +443,7 @@ jobs:
     file: git-repo/ci/tasks/stage.yml
     params:
       RELEASE_TYPE: RELEASE
+      GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
   - put: artifactory-repo
     params:
       <<: *artifactory-repo-put-params
diff --git a/ci/scripts/build-project.sh b/ci/scripts/build-project.sh
index da3c44e472..af694d0057 100755
--- a/ci/scripts/build-project.sh
+++ b/ci/scripts/build-project.sh
@@ -5,6 +5,6 @@ source $(dirname $0)/common.sh
 repository=$(pwd)/distribution-repository
 
 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}
 popd > /dev/null