Skip to content

Commit 6215052

Browse files
committed
Polish integration of Gradle Enterprise in CI builds
1 parent d435c19 commit 6215052

File tree

2 files changed

+24
-1
lines changed

2 files changed

+24
-1
lines changed

ci/pipeline.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,16 @@ anchors:
88
username: ((docker-hub-username))
99
password: ((docker-hub-password))
1010
tag: ((milestone))
11+
gradle-enterprise-task-params: &gradle-enterprise-task-params
12+
GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
13+
GRADLE_ENTERPRISE_CACHE_USERNAME: ((gradle_enterprise_cache_user.username))
14+
GRADLE_ENTERPRISE_CACHE_PASSWORD: ((gradle_enterprise_cache_user.password))
1115
build-project-task-params: &build-project-task-params
1216
privileged: true
1317
timeout: ((task-timeout))
1418
file: git-repo/ci/tasks/build-project.yml
19+
params:
20+
<<: *gradle-enterprise-task-params
1521
github-task-params: &github-task-params
1622
GITHUB_REPO: spring-boot
1723
GITHUB_ORGANIZATION: spring-projects
@@ -245,14 +251,20 @@ jobs:
245251
image: spring-boot-ci-image
246252
file: git-repo/ci/tasks/build-samples.yml
247253
timeout: ((task-timeout))
254+
params:
255+
<<: *gradle-enterprise-task-params
248256
- task: build-integration-tests
249257
image: spring-boot-ci-image
250258
file: git-repo/ci/tasks/build-integration-tests.yml
251259
timeout: ((task-timeout))
260+
params:
261+
<<: *gradle-enterprise-task-params
252262
- task: build-deployment-tests
253263
image: spring-boot-ci-image
254264
file: git-repo/ci/tasks/build-deployment-tests.yml
255265
timeout: ((task-timeout))
266+
params:
267+
<<: *gradle-enterprise-task-params
256268
on_failure:
257269
do:
258270
- put: repo-status-build
@@ -332,14 +344,20 @@ jobs:
332344
image: spring-boot-jdk11-ci-image
333345
file: git-repo/ci/tasks/build-samples.yml
334346
timeout: ((task-timeout))
347+
params:
348+
<<: *gradle-enterprise-task-params
335349
- task: build-integration-tests
336350
image: spring-boot-jdk11-ci-image
337351
file: git-repo/ci/tasks/build-integration-tests.yml
338352
timeout: ((task-timeout))
353+
params:
354+
<<: *gradle-enterprise-task-params
339355
- task: build-deployment-tests
340356
image: spring-boot-jdk11-ci-image
341357
file: git-repo/ci/tasks/build-deployment-tests.yml
342358
timeout: ((task-timeout))
359+
params:
360+
<<: *gradle-enterprise-task-params
343361
on_failure:
344362
do:
345363
- put: repo-status-jdk11-build
@@ -366,6 +384,8 @@ jobs:
366384
tags:
367385
- WIN64
368386
timeout: ((task-timeout))
387+
params:
388+
<<: *gradle-enterprise-task-params
369389
on_failure:
370390
do:
371391
- put: slack-alert
@@ -385,6 +405,7 @@ jobs:
385405
file: git-repo/ci/tasks/stage.yml
386406
params:
387407
RELEASE_TYPE: M
408+
GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
388409
- put: artifactory-repo
389410
params:
390411
<<: *artifactory-repo-put-params
@@ -403,6 +424,7 @@ jobs:
403424
file: git-repo/ci/tasks/stage.yml
404425
params:
405426
RELEASE_TYPE: RC
427+
GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
406428
- put: artifactory-repo
407429
params:
408430
<<: *artifactory-repo-put-params
@@ -421,6 +443,7 @@ jobs:
421443
file: git-repo/ci/tasks/stage.yml
422444
params:
423445
RELEASE_TYPE: RELEASE
446+
GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
424447
- put: artifactory-repo
425448
params:
426449
<<: *artifactory-repo-put-params

ci/scripts/build-project.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ source $(dirname $0)/common.sh
55
repository=$(pwd)/distribution-repository
66

77
pushd git-repo > /dev/null
8-
run_maven -N clean verify
8+
run_maven -N clean verify -Dscan=false
99
run_maven -f spring-boot-project/pom.xml clean deploy -U -Dfull -DaltDeploymentRepository=distribution::default::file://${repository}
1010
popd > /dev/null

0 commit comments

Comments
 (0)