diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index d937159662e682..9e14c5bac2e0b8 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -331,17 +331,6 @@ jobs: helixProjectArguments: '$(Build.SourcesDirectory)/src/tests/Common/helixpublishwitharcade.proj' - # helixpublishwitharcade.proj processes one scenario per parallel MSBuild invocation. Each invocation only - # creates Helix work items and them waits for their completion on the remote Helix machines, so is not - # computationally intensive. We want Helix to be provided with all the possible work items in up front, - # so can do as much work in parallel as possible. Thus, increase the amount of allowed MSBuild parallelism - # to at least the maximum number of scenarios to be processed in a testGroup. - # - # We only need to do this for a testGroup with more than one or two scenarios, though it isn't functionally - # a problem to always do it. Thus, we only exempt this setting for a few cases. - ${{ if notIn(parameters.testGroup, 'innerloop', 'outerloop', 'ilasm', 'gc-longrunning', 'gc-simulator', 'gc-standalone', 'gc-standalone-server') }}: - msbuildParallelism: '/maxcpucount:55' - ${{ if in(parameters.testGroup, 'innerloop', 'outerloop') }}: ${{ if and(eq(parameters.runInterpreter, 'true'),eq(variables['Build.Reason'], 'PullRequest')) }}: scenarios: diff --git a/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml b/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml index e959eba200b4cf..50e9de6dcf9fd2 100644 --- a/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml +++ b/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml @@ -13,7 +13,6 @@ parameters: helixQueues: '' helixType: '' useHelixMonitor: false - msbuildParallelism: '/maxcpucount' scenarios: '' timeoutPerTestCollectionInMinutes: '' timeoutPerTestInMinutes: '' @@ -45,7 +44,7 @@ steps: osGroup: ${{ parameters.osGroup }} sendParams: > ${{ parameters.helixProjectArguments }} - ${{ parameters.msbuildParallelism }} + /m /bl:$(Build.SourcesDirectory)/artifacts/log/SendToHelix.binlog /p:TargetArchitecture=${{ parameters.archType }} /p:TargetOS=${{ parameters.osGroup }}