From 9593368e7e24c405f60e7588a919168fc6a52168 Mon Sep 17 00:00:00 2001 From: Jonathon Marolf Date: Fri, 9 Dec 2022 10:02:13 -0800 Subject: [PATCH 1/9] Move perf tests to new pool --- azure-pipelines-perf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines-perf.yml b/azure-pipelines-perf.yml index 55a2f92ec8..502adc746c 100644 --- a/azure-pipelines-perf.yml +++ b/azure-pipelines-perf.yml @@ -22,7 +22,7 @@ jobs: _codeCoverage: False pool: name: Azure Pipelines - queue: Windows.10.Amd64.20H2.Owl.Perf + queue: Windows.10.Amd64.19H1.Tiger.Perf.Open timeoutInMinutes: 150 steps: From 64a3b97a8d6dea6490179725afe27d5ed9096ed6 Mon Sep 17 00:00:00 2001 From: Jonathon Marolf Date: Fri, 9 Dec 2022 10:06:49 -0800 Subject: [PATCH 2/9] use public queue from /eng/testing/performance/performance-setup.ps1 --- azure-pipelines-perf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines-perf.yml b/azure-pipelines-perf.yml index 502adc746c..f73a3c81e1 100644 --- a/azure-pipelines-perf.yml +++ b/azure-pipelines-perf.yml @@ -22,7 +22,7 @@ jobs: _codeCoverage: False pool: name: Azure Pipelines - queue: Windows.10.Amd64.19H1.Tiger.Perf.Open + queue: Windows.10.Amd64.ClientRS4.DevEx.15.8.Open timeoutInMinutes: 150 steps: From dcee858ebc48d5afaa1d3ab3bb1740096089ebf7 Mon Sep 17 00:00:00 2001 From: Jonathon Marolf Date: Fri, 9 Dec 2022 10:08:50 -0800 Subject: [PATCH 3/9] use new queue specification --- azure-pipelines-perf.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines-perf.yml b/azure-pipelines-perf.yml index f73a3c81e1..848eeae961 100644 --- a/azure-pipelines-perf.yml +++ b/azure-pipelines-perf.yml @@ -21,8 +21,8 @@ jobs: _configuration: Release _codeCoverage: False pool: - name: Azure Pipelines - queue: Windows.10.Amd64.ClientRS4.DevEx.15.8.Open + name: NetCore-Public + demands: ImageOverride -equals Windows.10.Amd64.19H1.Tiger.Perf.Open timeoutInMinutes: 150 steps: From 790c45a8a62c222fe94d7ca7e8c4d289c5fed95f Mon Sep 17 00:00:00 2001 From: Jonathon Marolf Date: Fri, 9 Dec 2022 10:10:34 -0800 Subject: [PATCH 4/9] use public queue --- azure-pipelines-perf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines-perf.yml b/azure-pipelines-perf.yml index 848eeae961..139138d852 100644 --- a/azure-pipelines-perf.yml +++ b/azure-pipelines-perf.yml @@ -22,7 +22,7 @@ jobs: _codeCoverage: False pool: name: NetCore-Public - demands: ImageOverride -equals Windows.10.Amd64.19H1.Tiger.Perf.Open + demands: ImageOverride -equals Windows.10.Amd64.ClientRS4.DevEx.15.8.Open timeoutInMinutes: 150 steps: From 99082cfa537589167013026287be60b049c366f0 Mon Sep 17 00:00:00 2001 From: Jonathon Marolf Date: Fri, 9 Dec 2022 10:41:20 -0800 Subject: [PATCH 5/9] Use normal image --- azure-pipelines-perf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines-perf.yml b/azure-pipelines-perf.yml index 139138d852..3a3f8428bd 100644 --- a/azure-pipelines-perf.yml +++ b/azure-pipelines-perf.yml @@ -22,7 +22,7 @@ jobs: _codeCoverage: False pool: name: NetCore-Public - demands: ImageOverride -equals Windows.10.Amd64.ClientRS4.DevEx.15.8.Open + demands: ImageOverride -equals windows.vs2022.amd64 timeoutInMinutes: 150 steps: From 20ee21369537887afb278787a0432cea2d420213 Mon Sep 17 00:00:00 2001 From: Jonathon Marolf Date: Fri, 9 Dec 2022 10:45:07 -0800 Subject: [PATCH 6/9] update image name --- azure-pipelines-perf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines-perf.yml b/azure-pipelines-perf.yml index 3a3f8428bd..e2db93cdf2 100644 --- a/azure-pipelines-perf.yml +++ b/azure-pipelines-perf.yml @@ -22,7 +22,7 @@ jobs: _codeCoverage: False pool: name: NetCore-Public - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2022.amd64.open timeoutInMinutes: 150 steps: From 65007bbf40188e80711f05a50c4d87ac1b3cb955 Mon Sep 17 00:00:00 2001 From: Jonathon Marolf Date: Fri, 9 Dec 2022 12:22:53 -0800 Subject: [PATCH 7/9] respect switch --- eng/perf/PerfCore.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/perf/PerfCore.ps1 b/eng/perf/PerfCore.ps1 index 90b11de678..725621dfbb 100644 --- a/eng/perf/PerfCore.ps1 +++ b/eng/perf/PerfCore.ps1 @@ -48,7 +48,7 @@ try { $output = Join-Path $RepoRoot "artifacts\performance\perfResults" # Diff two different SHAs - if ($true) { + if ($diff) { $DiffPerfToBaseLine = Join-Path $RepoRoot "eng\perf\DiffPerfToBaseLine.ps1" $baselinejson = Get-Content -Raw -Path (Join-Path $RepoRoot "eng\perf\baseline.json") | ConvertFrom-Json $baselineSHA = $baselinejson.sha @@ -86,4 +86,4 @@ catch { exit 1 } finally { -} \ No newline at end of file +} From 709388f8b2304c4792e4d5d726cd5e3ebaf51c27 Mon Sep 17 00:00:00 2001 From: Jonathon Marolf Date: Fri, 9 Dec 2022 12:23:21 -0800 Subject: [PATCH 8/9] do not diff changes --- azure-pipelines-perf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines-perf.yml b/azure-pipelines-perf.yml index e2db93cdf2..b66a374961 100644 --- a/azure-pipelines-perf.yml +++ b/azure-pipelines-perf.yml @@ -33,7 +33,7 @@ jobs: inputs: filePath: $(Build.SourcesDirectory)\eng\common\build.ps1 arguments: -configuration Release -prepareMachine -ci -restore -binaryLog - - pwsh: $(Build.SourcesDirectory)\eng\perf\PerfCore.ps1 -v diag -diff -ci + - pwsh: $(Build.SourcesDirectory)\eng\perf\PerfCore.ps1 -v diag -ci displayName: Validate Performance - task: PublishBuildArtifacts@1 displayName: Publish Performance Results From 7e5162c1ce567e467dfa71f84d2501f45964413d Mon Sep 17 00:00:00 2001 From: Jonathon Marolf Date: Fri, 9 Dec 2022 14:16:18 -0800 Subject: [PATCH 9/9] include .NET 6 runtime --- global.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/global.json b/global.json index 9a3f907ec7..215b092e16 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,8 @@ "dotnet": "7.0.100-rc.1.22431.12", "runtimes": { "dotnet": [ - "3.1.7" + "3.1.7", + "6.0.11" ] }, "vs": {