diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 268d3cb809..d96bb1dc6c 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -8,15 +8,10 @@ anchors: username: ((docker-hub-username)) password: ((docker-hub-password)) tag: ((milestone)) - build-project-task-params: &build-project-task-params - privileged: true - timeout: ((task-timeout)) - file: git-repo/ci/tasks/build-project.yml - params: - BRANCH: ((branch)) - 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)) + 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)) github-task-params: &github-task-params GITHUB_REPO: spring-boot GITHUB_ORGANIZATION: spring-projects @@ -35,6 +30,13 @@ anchors: ARTIFACTORY_SERVER: ((artifactory-server)) ARTIFACTORY_USERNAME: ((artifactory-username)) ARTIFACTORY_PASSWORD: ((artifactory-password)) + build-project-task-params: &build-project-task-params + privileged: true + timeout: ((task-timeout)) + file: git-repo/ci/tasks/build-project.yml + params: + BRANCH: ((branch)) + <<: *gradle-enterprise-task-params artifactory-repo-put-params: &artifactory-repo-put-params repo: libs-snapshot-local folder: distribution-repository @@ -395,9 +397,7 @@ jobs: timeout: ((task-timeout)) params: BRANCH: ((branch)) - 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)) + <<: *gradle-enterprise-task-params on_failure: do: - put: slack-alert @@ -417,9 +417,7 @@ jobs: file: git-repo/ci/tasks/stage.yml params: RELEASE_TYPE: M - 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)) + <<: *gradle-enterprise-task-params - put: artifactory-repo params: <<: *artifactory-repo-put-params @@ -438,9 +436,7 @@ jobs: file: git-repo/ci/tasks/stage.yml params: RELEASE_TYPE: RC - 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)) + <<: *gradle-enterprise-task-params - put: artifactory-repo params: <<: *artifactory-repo-put-params @@ -459,9 +455,7 @@ jobs: file: git-repo/ci/tasks/stage.yml params: RELEASE_TYPE: RELEASE - 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)) + <<: *gradle-enterprise-task-params - put: artifactory-repo params: <<: *artifactory-repo-put-params