Fix task parameters in CI build pipeline
Prior to this commit, the task parameters for the CI project checks were overridden by a task anchor. This commit splits the anchor declaration and ensures that the `TEST_TOOLCHAIN` setting is set for the JDK variant builds. See gh-25787
This commit is contained in:
parent
4152ebc2f3
commit
a522ed0788
|
@ -18,9 +18,6 @@ anchors:
|
||||||
ARTIFACTORY_USERNAME: ((artifactory-username))
|
ARTIFACTORY_USERNAME: ((artifactory-username))
|
||||||
ARTIFACTORY_PASSWORD: ((artifactory-password))
|
ARTIFACTORY_PASSWORD: ((artifactory-password))
|
||||||
build-project-task-params: &build-project-task-params
|
build-project-task-params: &build-project-task-params
|
||||||
privileged: true
|
|
||||||
timeout: ((task-timeout))
|
|
||||||
params:
|
|
||||||
BRANCH: ((branch))
|
BRANCH: ((branch))
|
||||||
<<: *gradle-enterprise-task-params
|
<<: *gradle-enterprise-task-params
|
||||||
docker-resource-source: &docker-resource-source
|
docker-resource-source: &docker-resource-source
|
||||||
|
@ -175,7 +172,10 @@ jobs:
|
||||||
- task: build-project
|
- task: build-project
|
||||||
image: ci-image
|
image: ci-image
|
||||||
file: git-repo/ci/tasks/build-project.yml
|
file: git-repo/ci/tasks/build-project.yml
|
||||||
<<: *build-project-task-params
|
privileged: true
|
||||||
|
timeout: ((task-timeout))
|
||||||
|
params:
|
||||||
|
<<: *build-project-task-params
|
||||||
on_failure:
|
on_failure:
|
||||||
do:
|
do:
|
||||||
- put: repo-status-build
|
- put: repo-status-build
|
||||||
|
@ -230,9 +230,11 @@ jobs:
|
||||||
- task: check-project
|
- task: check-project
|
||||||
image: ci-image
|
image: ci-image
|
||||||
file: git-repo/ci/tasks/check-project.yml
|
file: git-repo/ci/tasks/check-project.yml
|
||||||
|
privileged: true
|
||||||
|
timeout: ((task-timeout))
|
||||||
params:
|
params:
|
||||||
TEST_TOOLCHAIN: 11
|
TEST_TOOLCHAIN: 11
|
||||||
<<: *build-project-task-params
|
<<: *build-project-task-params
|
||||||
on_failure:
|
on_failure:
|
||||||
do:
|
do:
|
||||||
- put: repo-status-jdk11-build
|
- put: repo-status-jdk11-build
|
||||||
|
@ -256,9 +258,11 @@ jobs:
|
||||||
- task: check-project
|
- task: check-project
|
||||||
image: ci-image
|
image: ci-image
|
||||||
file: git-repo/ci/tasks/check-project.yml
|
file: git-repo/ci/tasks/check-project.yml
|
||||||
|
privileged: true
|
||||||
|
timeout: ((task-timeout))
|
||||||
params:
|
params:
|
||||||
TEST_TOOLCHAIN: 15
|
TEST_TOOLCHAIN: 15
|
||||||
<<: *build-project-task-params
|
<<: *build-project-task-params
|
||||||
on_failure:
|
on_failure:
|
||||||
do:
|
do:
|
||||||
- put: repo-status-jdk15-build
|
- put: repo-status-jdk15-build
|
||||||
|
@ -285,7 +289,10 @@ jobs:
|
||||||
- task: build-pr
|
- task: build-pr
|
||||||
image: ci-image
|
image: ci-image
|
||||||
file: git-repo/ci/tasks/build-pr.yml
|
file: git-repo/ci/tasks/build-pr.yml
|
||||||
<<: *build-project-task-params
|
privileged: true
|
||||||
|
timeout: ((task-timeout))
|
||||||
|
params:
|
||||||
|
<<: *build-project-task-params
|
||||||
on_success:
|
on_success:
|
||||||
put: git-pull-request
|
put: git-pull-request
|
||||||
params:
|
params:
|
||||||
|
|
Loading…
Reference in New Issue