From a522ed078849fae924ba5706beb30a6b3d85fc2c Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Tue, 4 May 2021 11:48:17 +0200
Subject: [PATCH] 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
---
 ci/pipeline.yml | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 3a24aaef50f..eb752fe705c 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -18,9 +18,6 @@ anchors:
     ARTIFACTORY_USERNAME: ((artifactory-username))
     ARTIFACTORY_PASSWORD: ((artifactory-password))
   build-project-task-params: &build-project-task-params
-    privileged: true
-    timeout: ((task-timeout))
-    params:
       BRANCH: ((branch))
       <<: *gradle-enterprise-task-params
   docker-resource-source: &docker-resource-source
@@ -175,7 +172,10 @@ jobs:
     - task: build-project
       image: ci-image
       file: git-repo/ci/tasks/build-project.yml
-      <<: *build-project-task-params
+      privileged: true
+      timeout: ((task-timeout))
+      params:
+        <<: *build-project-task-params
     on_failure:
       do:
       - put: repo-status-build
@@ -230,9 +230,11 @@ jobs:
     - task: check-project
       image: ci-image
       file: git-repo/ci/tasks/check-project.yml
+      privileged: true
+      timeout: ((task-timeout))
       params:
         TEST_TOOLCHAIN: 11
-      <<: *build-project-task-params
+        <<: *build-project-task-params
     on_failure:
       do:
       - put: repo-status-jdk11-build
@@ -256,9 +258,11 @@ jobs:
       - task: check-project
         image: ci-image
         file: git-repo/ci/tasks/check-project.yml
+        privileged: true
+        timeout: ((task-timeout))
         params:
           TEST_TOOLCHAIN: 15
-        <<: *build-project-task-params
+          <<: *build-project-task-params
       on_failure:
         do:
           - put: repo-status-jdk15-build
@@ -285,7 +289,10 @@ jobs:
       - task: build-pr
         image: ci-image
         file: git-repo/ci/tasks/build-pr.yml
-        <<: *build-project-task-params
+        privileged: true
+        timeout: ((task-timeout))
+        params:
+          <<: *build-project-task-params
       on_success:
         put: git-pull-request
         params: