From: Olivia Chen <51934529+ooooolivia@users.noreply.github.com> Date: Thu, 17 Sep 2020 00:32:22 +0000 (-0700) Subject: correct perf-send-to-helix on windows (#42235) X-Git-Tag: submit/tizen/20210909.063632~5454 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3d75475979bda71ab0dfc4156ae7a660aa19ccfa;p=platform%2Fupstream%2Fdotnet%2Fruntime.git correct perf-send-to-helix on windows (#42235) * correct perf helix workitems on windows * Will Revert: turn on PR validation * change Agent.Os to runtime var * remove sendparams condition * test if macro syntax var case sensitive * try expression for Agent.Os * try $(Agent.Os) * pass osGroup param * revert pr trigger: --- diff --git a/eng/common/templates/steps/perf-send-to-helix.yml b/eng/common/templates/steps/perf-send-to-helix.yml index 429a1a2..8427de5 100644 --- a/eng/common/templates/steps/perf-send-to-helix.yml +++ b/eng/common/templates/steps/perf-send-to-helix.yml @@ -19,12 +19,13 @@ parameters: DisplayNamePrefix: 'Send job to Helix' # optional -- rename the beginning of the displayName of the steps in AzDO condition: succeeded() # optional -- condition for step to execute; defaults to succeeded() continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false + osGroup: '' # required -- operating system for the job steps: - template: /eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml parameters: - osGroup: ${{ variables['Agent.Os'] }} + osGroup: ${{ parameters.osGroup }} sendParams: $(Build.SourcesDirectory)/eng/common/performance/${{ parameters.ProjectFile }} /restore /t:Test /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog displayName: ${{ parameters.DisplayNamePrefix }} condition: ${{ parameters.condition }} diff --git a/eng/pipelines/coreclr/templates/run-performance-job.yml b/eng/pipelines/coreclr/templates/run-performance-job.yml index a3790ae..7cbead3 100644 --- a/eng/pipelines/coreclr/templates/run-performance-job.yml +++ b/eng/pipelines/coreclr/templates/run-performance-job.yml @@ -128,6 +128,7 @@ jobs: WorkItemDirectory: '$(WorkItemDirectory)' # WorkItemDirectory can not be empty, so we send it some docs to keep it happy CorrelationPayloadDirectory: '$(PayloadDirectory)' # it gets checked out to a folder with shorter path than WorkItemDirectory so we can avoid file name too long exceptions ProjectFile: ${{ parameters.projectFile }} + osGroup: ${{ parameters.osGroup }} - task: PublishPipelineArtifact@1 displayName: Publish Logs inputs: diff --git a/eng/pipelines/coreclr/templates/run-scenarios-job.yml b/eng/pipelines/coreclr/templates/run-scenarios-job.yml index cd34ba2..84451af 100644 --- a/eng/pipelines/coreclr/templates/run-scenarios-job.yml +++ b/eng/pipelines/coreclr/templates/run-scenarios-job.yml @@ -151,6 +151,7 @@ jobs: WorkItemDirectory: '$(WorkItemDirectory)' # contains scenario tools, shared python scripts, dotnet tool CorrelationPayloadDirectory: '$(PayloadDirectory)' # contains performance repo and built product ProjectFile: ${{ parameters.projectFile }} + osGroup: ${{ parameters.osGroup }} # publish logs - task: PublishPipelineArtifact@1