From 920a17ac91440abb5b34109104e72da77ec58b59 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com>
Date: Tue, 10 Dec 2024 10:51:35 +0100
Subject: [PATCH] Disable `HybridGlobalization` tests for WASM on CI (#110526)
---
eng/pipelines/coreclr/perf-wasm-jobs.yml | 23 --------------
.../runtime-extra-platforms-wasm.yml | 31 -------------------
eng/testing/performance/blazor_perf.proj | 23 ++++++--------
3 files changed, 9 insertions(+), 68 deletions(-)
diff --git a/eng/pipelines/coreclr/perf-wasm-jobs.yml b/eng/pipelines/coreclr/perf-wasm-jobs.yml
index 93ffdfc528382..8323bbc448e46 100644
--- a/eng/pipelines/coreclr/perf-wasm-jobs.yml
+++ b/eng/pipelines/coreclr/perf-wasm-jobs.yml
@@ -171,26 +171,3 @@ jobs:
logicalmachine: 'perftiger'
downloadSpecificBuild: ${{ parameters.downloadSpecificBuild }}
perfBranch: ${{ parameters.perfBranch }}
-
-- ${{if or(and(ne(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'Schedule')), in(variables['Build.DefinitionName'], 'runtime-wasm-perf')) }}:
- # run mono wasm blazor perf job
- - template: /eng/pipelines/common/platform-matrix.yml
- parameters:
- jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml
- buildConfig: release
- runtimeFlavor: wasm
- platforms:
- - linux_x64
- jobParameters:
- testGroup: perf
- liveLibrariesBuildConfig: Release
- runtimeType: wasm
- projectFile: $(Build.SourcesDirectory)/eng/testing/performance/blazor_perf.proj
- runKind: blazor_scenarios
- runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml
- # For working with a newer sdk, and previous tfm (eg. 9.0 sdk, and net8.0 tfm)
- #additionalSetupParameters: '--dotnetversions 8.0.0' # passed to run-performance-job.py
- logicalmachine: 'perftiger'
- downloadSpecificBuild: ${{ parameters.downloadSpecificBuild }}
- hybridGlobalization: True
- perfBranch: ${{ parameters.perfBranch }}
diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml
index f2c2f84e8730a..06b65b209ba50 100644
--- a/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml
+++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml
@@ -148,37 +148,6 @@ jobs:
scenarios:
- WasmTestOnWasmtime
- # Hybrid Globalization tests
- - template: /eng/pipelines/common/templates/wasm-library-tests.yml
- parameters:
- platforms:
- - browser_wasm
- - browser_wasm_win
- nameSuffix: _HybridGlobalization
- extraBuildArgs: /p:HybridGlobalization=true
- isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
- isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
- alwaysRun: true
- scenarios:
- - WasmTestOnChrome
- - WasmTestOnFirefox
-
- # # Hybrid Globalization AOT tests
- # # ActiveIssue: https://github.com/dotnet/runtime/issues/51746
- # - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml
- # parameters:
- # platforms:
- # - browser_wasm
- # - browser_wasm_win
- # nameSuffix: _HybridGlobalization_AOT
- # extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) /p:HybridGlobalization=true
- # runAOT: true
- # isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
- # isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
- # alwaysRun: true
- # scenarios:
- # - WasmTestOnChrome
-
- ${{ if and(ne(parameters.isRollingBuild, true), ne(parameters.excludeNonLibTests, true), ne(parameters.debuggerTestsOnly, true)) }}:
# Builds only
- template: /eng/pipelines/common/templates/wasm-build-only.yml
diff --git a/eng/testing/performance/blazor_perf.proj b/eng/testing/performance/blazor_perf.proj
index 08aea69800b67..bcad56a4be50b 100644
--- a/eng/testing/performance/blazor_perf.proj
+++ b/eng/testing/performance/blazor_perf.proj
@@ -9,14 +9,9 @@
python3
$(HelixPreCommands);chmod +x $HELIX_WORKITEM_PAYLOAD/SOD/SizeOnDisk
- <_MSBuildArgs>/p:_TrimmerDumpDependencies=true;/p:HybridGlobalization=$(hybridGlobalization);/warnaserror:NU1602,NU1604
+ <_MSBuildArgs>/p:_TrimmerDumpDependencies=true;/warnaserror:NU1602,NU1604
--has-workload --readonly-dotnet --msbuild "$(_MSBuildArgs)" --msbuild-static AdditionalMonoLinkerOptions=%27"%24(AdditionalMonoLinkerOptions) --dump-dependencies"%27 --binlog $(LogDirectory)blazor_publish.binlog
$(EnvVars) $(Python) pre.py publish $(PublishArgs)
-
-
- - HybridGlobalization
- $(HybridGlobalizationPath)
@@ -51,48 +46,48 @@
-
+
$(WorkItemDirectory)
cd $(BlazorMinDirectory) && $(PublishCommand) && $(Python) test.py sod --scenario-name "%(Identity)" $(ScenarioArgs)
-
+
$(WorkItemDirectory)
cd $(BlazorMinAOTDirectory) && $(PublishCommand) && $(Python) test.py sod --scenario-name "%(Identity)" $(ScenarioArgs)
00:30
-
+
$(WorkItemDirectory)
cd $(BlazorDirectory) && $(PublishCommand) && $(Python) test.py sod --scenario-name "%(Identity)" $(ScenarioArgs)
$(Python) post.py --readonly-dotnet
-
+
$(WorkItemDirectory)
cd $(BlazorAOTDirectory) && $(PublishCommand) && $(Python) test.py sod --scenario-name "%(Identity)" $(ScenarioArgs)
$(Python) post.py --readonly-dotnet
00:30
-
+
$(WorkItemDirectory)
cd $(BlazorPizzaDirectory) && $(PublishCommand) -f $(PerflabTargetFrameworks) && $(Python) test.py sod --scenario-name "%(Identity)" --dirs $(PizzaAppPubLocation) $(ScenarioArgs)
$(Python) post.py --readonly-dotnet
-
+
$(WorkItemDirectory)
cd $(BlazorPizzaAOTDirectory) && $(PublishCommand) -f $(PerflabTargetFrameworks) && $(Python) test.py sod --scenario-name "%(Identity)" --dirs $(PizzaAppPubLocation) $(ScenarioArgs)
$(Python) post.py --readonly-dotnet
1:00
-
+
$(WorkItemDirectory)
cd $(BlazorLocalizedDirectory) && $(PublishCommand) -f $(PerflabTargetFrameworks) && $(Python) test.py sod --scenario-name "%(Identity)" --dirs $(PizzaAppPubLocation) $(ScenarioArgs)
$(Python) post.py --readonly-dotnet
1:00
-
+
<_PublishArgsWithAOT>--msbuild "$(_MSBuildArgs);/p:RunAOTCompilation=true"
$(WorkItemDirectory)
cd $(BlazorLocalizedDirectory) && $(PublishCommand) $(_PublishArgsWithAOT) -f $(PerflabTargetFrameworks) && $(Python) test.py sod --scenario-name "%(Identity)" --dirs $(PizzaAppPubLocation) $(ScenarioArgs)