Skip to content

Commit a522ed0

Browse files
committed
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
1 parent 4152ebc commit a522ed0

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

ci/pipeline.yml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ anchors:
1818
ARTIFACTORY_USERNAME: ((artifactory-username))
1919
ARTIFACTORY_PASSWORD: ((artifactory-password))
2020
build-project-task-params: &build-project-task-params
21-
privileged: true
22-
timeout: ((task-timeout))
23-
params:
2421
BRANCH: ((branch))
2522
<<: *gradle-enterprise-task-params
2623
docker-resource-source: &docker-resource-source
@@ -175,7 +172,10 @@ jobs:
175172
- task: build-project
176173
image: ci-image
177174
file: git-repo/ci/tasks/build-project.yml
178-
<<: *build-project-task-params
175+
privileged: true
176+
timeout: ((task-timeout))
177+
params:
178+
<<: *build-project-task-params
179179
on_failure:
180180
do:
181181
- put: repo-status-build
@@ -230,9 +230,11 @@ jobs:
230230
- task: check-project
231231
image: ci-image
232232
file: git-repo/ci/tasks/check-project.yml
233+
privileged: true
234+
timeout: ((task-timeout))
233235
params:
234236
TEST_TOOLCHAIN: 11
235-
<<: *build-project-task-params
237+
<<: *build-project-task-params
236238
on_failure:
237239
do:
238240
- put: repo-status-jdk11-build
@@ -256,9 +258,11 @@ jobs:
256258
- task: check-project
257259
image: ci-image
258260
file: git-repo/ci/tasks/check-project.yml
261+
privileged: true
262+
timeout: ((task-timeout))
259263
params:
260264
TEST_TOOLCHAIN: 15
261-
<<: *build-project-task-params
265+
<<: *build-project-task-params
262266
on_failure:
263267
do:
264268
- put: repo-status-jdk15-build
@@ -285,7 +289,10 @@ jobs:
285289
- task: build-pr
286290
image: ci-image
287291
file: git-repo/ci/tasks/build-pr.yml
288-
<<: *build-project-task-params
292+
privileged: true
293+
timeout: ((task-timeout))
294+
params:
295+
<<: *build-project-task-params
289296
on_success:
290297
put: git-pull-request
291298
params:

0 commit comments

Comments
 (0)