Skip to content

Commit 967250c

Browse files
authored
Add support for skipping workloads testing for previous versions (#82742)
* Add support for skipping workloads testing for previous versions This will skip installing manifests for 6, and 7, for example, and install only install the latest ones. This is because on release branches the newest versions might not have public packages available yet. * Set $(WorkloadsTestPreviousVersions) in the yml .. based on the branch. Set it to `true` only for `main`.
1 parent ccbcb7f commit 967250c

File tree

4 files changed

+16
-8
lines changed

4 files changed

+16
-8
lines changed

eng/pipelines/common/templates/wasm-build-tests.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ jobs:
2222
# map dependencies variables to local variables
2323
- name: alwaysRunVar
2424
value: ${{ parameters.alwaysRun }}
25+
- name: workloadsTestPreviousVersionsVar
26+
value: $[
27+
or(
28+
eq(variables['Build.SourceBranchName'], 'main'),
29+
eq(variables['System.PullRequest.TargetBranch'], 'main'))
30+
]
2531
- name: shouldRunOnDefaultPipelines
2632
value: $[
2733
or(
@@ -33,7 +39,7 @@ jobs:
3339
isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
3440
testGroup: innerloop
3541
nameSuffix: WasmBuildTests
36-
buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:TestWasmBuildTests=true /p:TestAssemblies=false /p:BrowserHost=$(_hostedOs)
42+
buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:TestWasmBuildTests=true /p:TestAssemblies=false /p:BrowserHost=$(_hostedOs) /p:WorkloadsTestPreviousVersions=$(workloadsTestPreviousVersionsVar)
3743
timeoutInMinutes: 180
3844
condition: >-
3945
or(

eng/testing/tests.browser.targets

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -234,17 +234,19 @@
234234
<WorkloadIdForTesting Include="wasm-tools-net7;wasm-experimental-net7"
235235
ManifestName="Microsoft.NET.Workload.Mono.ToolChain.net7"
236236
Variant="net7"
237-
Version="$(PackageVersionForWorkloadManifests)" />
237+
Version="$(PackageVersionForWorkloadManifests)"
238+
Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" />
238239

239240
<WorkloadIdForTesting Include="wasm-tools-net6"
240241
ManifestName="Microsoft.NET.Workload.Mono.ToolChain.net6"
241242
Variant="net6"
242243
Version="$(PackageVersionForWorkloadManifests)"
243-
IgnoreErrors="$(WasmIgnoreNet6WorkloadInstallErrors)" />
244+
IgnoreErrors="$(WasmIgnoreNet6WorkloadInstallErrors)"
245+
Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" />
244246

245-
<WorkloadCombinationsToInstall Include="latest" Variants="latest" />
246-
<WorkloadCombinationsToInstall Include="net7" Variants="net7" />
247-
<WorkloadCombinationsToInstall Include="net7+latest" Variants="net7;latest" />
247+
<WorkloadCombinationsToInstall Include="latest" Variants="latest" />
248+
<WorkloadCombinationsToInstall Include="net7" Variants="net7" Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" />
249+
<WorkloadCombinationsToInstall Include="net7+latest" Variants="net7;latest" Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" />
248250
<!--<WorkloadCombinationsToInstall Include="net6" Variants="net6" />-->
249251
<!--<WorkloadCombinationsToInstall Include="net6+7" Variants="net6;net7" />-->
250252
<!--<WorkloadCombinationsToInstall Include="none" />-->

src/libraries/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<SdkWithNoWorkloadStampPath>$(SdkWithNoWorkloadForTestingPath)version-$(SdkVersionForWorkloadTesting).stamp</SdkWithNoWorkloadStampPath>
9595
<SdkWithNoWorkload_WorkloadStampPath>$(SdkWithNoWorkloadForTestingPath)workload.stamp</SdkWithNoWorkload_WorkloadStampPath>
9696

97-
<SdkWithWorkloadForTestingPath Condition="'$(TargetOS)' == 'browser'">$(ArtifactsBinDir)dotnet-net7+latest\</SdkWithWorkloadForTestingPath>
97+
<SdkWithWorkloadForTestingPath Condition="'$(TargetOS)' == 'browser'">$(ArtifactsBinDir)dotnet-latest\</SdkWithWorkloadForTestingPath>
9898
<SdkWithWorkloadForTestingPath Condition="'$(TargetOS)' == 'wasi'">$(ArtifactsBinDir)dotnet-latest\</SdkWithWorkloadForTestingPath>
9999
<SdkWithWorkloadForTestingPath Condition="'$(SdkWithWorkloadForTestingPath)' != ''">$([MSBuild]::NormalizeDirectory($(SdkWithWorkloadForTestingPath)))</SdkWithWorkloadForTestingPath>
100100

src/libraries/sendtohelixhelp.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161

6262
<FailOnTestFailure Condition="'$(FailOnTestFailure)' == '' and '$(WaitForWorkItemCompletion)' != ''">$(WaitForWorkItemCompletion)</FailOnTestFailure>
6363

64-
<SdkForWorkloadTestingDirName Condition="'$(SdkForWorkloadTestingDirName)' == '' and '$(NeedsWorkload)' == 'true' and '$(TestUsingWorkloads)' == 'true'">dotnet-net7+latest</SdkForWorkloadTestingDirName>
64+
<SdkForWorkloadTestingDirName Condition="'$(SdkForWorkloadTestingDirName)' == '' and '$(NeedsWorkload)' == 'true' and '$(TestUsingWorkloads)' == 'true'">dotnet-latest</SdkForWorkloadTestingDirName>
6565
<SdkForWorkloadTestingDirName Condition="'$(SdkForWorkloadTestingDirName)' == '' and '$(NeedsWorkload)' == 'true' and '$(TestUsingWorkloads)' != 'true'">dotnet-none</SdkForWorkloadTestingDirName>
6666
</PropertyGroup>
6767

0 commit comments

Comments
 (0)