From 591589a99d20725666bb5ede02b5249157debd1b Mon Sep 17 00:00:00 2001 From: Olivia Chen Date: Mon, 14 Sep 2020 18:13:57 -0700 Subject: [PATCH 1/9] correct perf helix workitems on windows --- eng/common/templates/steps/perf-send-to-helix.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eng/common/templates/steps/perf-send-to-helix.yml b/eng/common/templates/steps/perf-send-to-helix.yml index 429a1a2566d8b..6952099030b42 100644 --- a/eng/common/templates/steps/perf-send-to-helix.yml +++ b/eng/common/templates/steps/perf-send-to-helix.yml @@ -25,7 +25,10 @@ steps: - template: /eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml parameters: osGroup: ${{ variables['Agent.Os'] }} - sendParams: $(Build.SourcesDirectory)/eng/common/performance/${{ parameters.ProjectFile }} /restore /t:Test /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog + ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + sendParams: $(Build.SourcesDirectory)\eng\common\performance\${{ parameters.ProjectFile }} /restore /t:Test /bl:$(Build.SourcesDirectory)\artifacts\log\$(_BuildConfig)\SendToHelix.binlog + ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + 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 }} continueOnError: ${{ parameters.continueOnError }} From 877ec4ffb5615911687757bb034c550a65d46258 Mon Sep 17 00:00:00 2001 From: Olivia Chen Date: Mon, 14 Sep 2020 18:23:00 -0700 Subject: [PATCH 2/9] Will Revert: turn on PR validation --- eng/pipelines/coreclr/perf.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/coreclr/perf.yml b/eng/pipelines/coreclr/perf.yml index a3fd8bb532b64..33c4985e4de2f 100644 --- a/eng/pipelines/coreclr/perf.yml +++ b/eng/pipelines/coreclr/perf.yml @@ -18,7 +18,24 @@ trigger: - SECURITY.md - THIRD-PARTY-NOTICES.TXT -pr: none +pr: + branches: + include: + - master + paths: + include: + - '*' + - src/libraries/System.Private.CoreLib/* + exclude: + - .github/* + - docs/* + - CODE-OF-CONDUCT.md + - CONTRIBUTING.md + - LICENSE.TXT + - PATENTS.TXT + - README.md + - SECURITY.md + - THIRD-PARTY-NOTICES.TXT jobs: # From 69004987d9533f893a49f1c0c866ee87f0ad660b Mon Sep 17 00:00:00 2001 From: Olivia Chen Date: Tue, 15 Sep 2020 10:22:19 -0700 Subject: [PATCH 3/9] change Agent.Os to runtime var --- eng/common/templates/steps/perf-send-to-helix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/templates/steps/perf-send-to-helix.yml b/eng/common/templates/steps/perf-send-to-helix.yml index 6952099030b42..efe1c6ee284cf 100644 --- a/eng/common/templates/steps/perf-send-to-helix.yml +++ b/eng/common/templates/steps/perf-send-to-helix.yml @@ -24,7 +24,7 @@ parameters: steps: - template: /eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml parameters: - osGroup: ${{ variables['Agent.Os'] }} + osGroup: $(Agent.Os) ${{ if eq(parameters.osGroup, 'Windows_NT') }}: sendParams: $(Build.SourcesDirectory)\eng\common\performance\${{ parameters.ProjectFile }} /restore /t:Test /bl:$(Build.SourcesDirectory)\artifacts\log\$(_BuildConfig)\SendToHelix.binlog ${{ if ne(parameters.osGroup, 'Windows_NT') }}: From 09a9e68ea6320c2acfa75576cf77ef7a9bd0c659 Mon Sep 17 00:00:00 2001 From: Olivia Chen Date: Tue, 15 Sep 2020 10:27:12 -0700 Subject: [PATCH 4/9] remove sendparams condition --- eng/common/templates/steps/perf-send-to-helix.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/eng/common/templates/steps/perf-send-to-helix.yml b/eng/common/templates/steps/perf-send-to-helix.yml index efe1c6ee284cf..34db9fa714791 100644 --- a/eng/common/templates/steps/perf-send-to-helix.yml +++ b/eng/common/templates/steps/perf-send-to-helix.yml @@ -25,10 +25,7 @@ steps: - template: /eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml parameters: osGroup: $(Agent.Os) - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: - sendParams: $(Build.SourcesDirectory)\eng\common\performance\${{ parameters.ProjectFile }} /restore /t:Test /bl:$(Build.SourcesDirectory)\artifacts\log\$(_BuildConfig)\SendToHelix.binlog - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: - sendParams: $(Build.SourcesDirectory)/eng/common/performance/${{ parameters.ProjectFile }} /restore /t:Test /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog + 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 }} continueOnError: ${{ parameters.continueOnError }} From 3d560c48444bcfa14e4a71df123bb654525a0b43 Mon Sep 17 00:00:00 2001 From: Olivia Chen Date: Tue, 15 Sep 2020 12:13:31 -0700 Subject: [PATCH 5/9] test if macro syntax var case sensitive --- eng/common/templates/steps/perf-send-to-helix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/templates/steps/perf-send-to-helix.yml b/eng/common/templates/steps/perf-send-to-helix.yml index 34db9fa714791..74f40a04a0af6 100644 --- a/eng/common/templates/steps/perf-send-to-helix.yml +++ b/eng/common/templates/steps/perf-send-to-helix.yml @@ -24,7 +24,7 @@ parameters: steps: - template: /eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml parameters: - osGroup: $(Agent.Os) + osGroup: $(Agent.OS) 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 }} From ee64f7b02f6e78c567ece015856a0d5212b24004 Mon Sep 17 00:00:00 2001 From: Olivia Chen Date: Tue, 15 Sep 2020 14:25:27 -0700 Subject: [PATCH 6/9] try expression for Agent.Os --- eng/common/templates/steps/perf-send-to-helix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/templates/steps/perf-send-to-helix.yml b/eng/common/templates/steps/perf-send-to-helix.yml index 74f40a04a0af6..9adc3dc258d07 100644 --- a/eng/common/templates/steps/perf-send-to-helix.yml +++ b/eng/common/templates/steps/perf-send-to-helix.yml @@ -24,7 +24,7 @@ parameters: steps: - template: /eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml parameters: - osGroup: $(Agent.OS) + osGroup: $[ variables['Agent.Os'] ] 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 }} From d81fab5b6e97c71e8e2b859bb158cb315ac398fd Mon Sep 17 00:00:00 2001 From: Olivia Chen Date: Wed, 16 Sep 2020 10:10:37 -0700 Subject: [PATCH 7/9] try $(Agent.Os) --- eng/common/templates/steps/perf-send-to-helix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/templates/steps/perf-send-to-helix.yml b/eng/common/templates/steps/perf-send-to-helix.yml index 9adc3dc258d07..34db9fa714791 100644 --- a/eng/common/templates/steps/perf-send-to-helix.yml +++ b/eng/common/templates/steps/perf-send-to-helix.yml @@ -24,7 +24,7 @@ parameters: steps: - template: /eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml parameters: - osGroup: $[ variables['Agent.Os'] ] + osGroup: $(Agent.Os) 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 }} From acc1570513df0a8f84d5112362c0e1df87af8c0e Mon Sep 17 00:00:00 2001 From: Olivia Chen Date: Wed, 16 Sep 2020 12:01:53 -0700 Subject: [PATCH 8/9] try setting condition --- eng/common/templates/steps/perf-send-to-helix.yml | 2 +- .../common/templates/runtimes/send-to-helix-inner-step.yml | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/eng/common/templates/steps/perf-send-to-helix.yml b/eng/common/templates/steps/perf-send-to-helix.yml index 34db9fa714791..91f7c285c6792 100644 --- a/eng/common/templates/steps/perf-send-to-helix.yml +++ b/eng/common/templates/steps/perf-send-to-helix.yml @@ -24,7 +24,7 @@ parameters: steps: - template: /eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml parameters: - osGroup: $(Agent.Os) + osGroup: variables['Agent.Os'] 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/common/templates/runtimes/send-to-helix-inner-step.yml b/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml index 647778511370b..4e6ac9d697073 100644 --- a/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml +++ b/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml @@ -7,18 +7,16 @@ parameters: environment: {} steps: -- ${{ if eq(parameters.osGroup, 'Windows_NT') }}: # TODO: Remove and consolidate this when we move to arcade via init-tools.cmd. - powershell: $(Build.SourcesDirectory)\eng\common\build.ps1 -ci ${{ parameters.restoreParams }} displayName: Restore blob feed tasks (Windows) - condition: ${{ and(ne(parameters.condition, false), ne(parameters.restoreParams, '')) }} + condition: and(and(ne(${{ parameters.condition }}, false), ne(${{ parameters.restoreParams }}, '')), eq(${{ parameters.osGroup }}, 'Windows_NT')) - powershell: $(Build.SourcesDirectory)\eng\common\msbuild.ps1 -ci ${{ parameters.sendParams }} displayName: ${{ parameters.displayName }} (Windows) - condition: ${{ and(ne(parameters.condition, false), ne(parameters.sendParams, '')) }} + condition: and(and(ne(${{ parameters.condition }}, false), ne(${{ parameters.sendParams }}, '')), eq(${{ parameters.osGroup }}, 'Windows_NT')) env: ${{ parameters.environment }} -- ${{ if ne(parameters.osGroup, 'Windows_NT') }}: # TODO: Remove and consolidate this when we move to arcade via init-tools.sh. - script: $(Build.SourcesDirectory)/eng/common/build.sh --ci ${{ parameters.restoreParams }} displayName: Restore blob feed tasks (Unix) From c8652d1904c7821c003399fb13afb483b2df4105 Mon Sep 17 00:00:00 2001 From: Olivia Chen Date: Wed, 16 Sep 2020 12:04:08 -0700 Subject: [PATCH 9/9] wip --- .../runtimes/send-to-helix-inner-step.yml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml b/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml index 4e6ac9d697073..4581413b024e0 100644 --- a/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml +++ b/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml @@ -17,16 +17,16 @@ steps: condition: and(and(ne(${{ parameters.condition }}, false), ne(${{ parameters.sendParams }}, '')), eq(${{ parameters.osGroup }}, 'Windows_NT')) env: ${{ parameters.environment }} - # TODO: Remove and consolidate this when we move to arcade via init-tools.sh. - - script: $(Build.SourcesDirectory)/eng/common/build.sh --ci ${{ parameters.restoreParams }} - displayName: Restore blob feed tasks (Unix) - condition: ${{ and(ne(parameters.condition, false), ne(parameters.restoreParams, '')) }} - ${{ if eq(parameters.osGroup, 'FreeBSD') }}: - env: - # Arcade uses this SDK instead of trying to restore one. - DotNetCoreSdkDir: /usr/local/dotnet + # # TODO: Remove and consolidate this when we move to arcade via init-tools.sh. + # - script: $(Build.SourcesDirectory)/eng/common/build.sh --ci ${{ parameters.restoreParams }} + # displayName: Restore blob feed tasks (Unix) + # condition: ${{ and(ne(parameters.condition, false), ne(parameters.restoreParams, '')) }} + # ${{ if eq(parameters.osGroup, 'FreeBSD') }}: + # env: + # # Arcade uses this SDK instead of trying to restore one. + # DotNetCoreSdkDir: /usr/local/dotnet - - script: $(Build.SourcesDirectory)/eng/common/msbuild.sh --ci ${{ parameters.sendParams }} - displayName: ${{ parameters.displayName }} (Unix) - condition: ${{ and(ne(parameters.condition, false), ne(parameters.sendParams, '')) }} - env: ${{ parameters.environment }} + # - script: $(Build.SourcesDirectory)/eng/common/msbuild.sh --ci ${{ parameters.sendParams }} + # displayName: ${{ parameters.displayName }} (Unix) + # condition: ${{ and(ne(parameters.condition, false), ne(parameters.sendParams, '')) }} + # env: ${{ parameters.environment }}