Skip to content

Enable VMR tests in more verticals #46342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 28, 2025
Merged

Enable VMR tests in more verticals #46342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce418da
Enable VMR tests in more verticals
ViktorHofer Jan 27, 2025
1b80105
Fix condition
ViktorHofer Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions eng/pipelines/templates/stages/vmr-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,6 @@ stages:
targetOS: linux
targetArchitecture: x64
useDevVersions: true # Use dev versions for CI validation of the experience.
runTests: false # Temporarily do not run tests. The nuget comparison fails for some non-obvious reason and needs further investigation. Mostly, I'm not sure why it ever passed. https://github.com/dotnet/sdk/issues/42920

- template: ../jobs/vmr-build.yml
parameters:
Expand All @@ -381,7 +380,6 @@ stages:
targetOS: windows
targetArchitecture: x86
useDevVersions: true # Use dev versions for CI validation of the experience.
runTests: false # Temporarily do not run tests. The nuget comparison fails for some non-obvious reason and needs further investigation. Mostly, I'm not sure why it ever passed. https://github.com/dotnet/sdk/issues/42920

#### VERTICAL BUILD (Official) ####
- ${{ if not(parameters.isSourceOnlyBuild) }}:
Expand Down Expand Up @@ -414,7 +412,6 @@ stages:
image: ${{ variables.androidCrossContainerImage }}
targetOS: android
targetArchitecture: arm64
runTests: false

- template: ../jobs/vmr-build.yml
parameters:
Expand All @@ -428,7 +425,6 @@ stages:
crossRootFs: '/crossrootfs/x64'
targetOS: browser
targetArchitecture: wasm
runTests: false

- template: ../jobs/vmr-build.yml
parameters:
Expand All @@ -438,7 +434,6 @@ stages:
pool: ${{ parameters.pool_Mac }}
targetOS: iossimulator
targetArchitecture: arm64
runTests: false

### Additional jobs for full build ###
- ${{ if in(parameters.scope, 'full') }}:
Expand All @@ -454,7 +449,6 @@ stages:
image: ${{ variables.androidCrossContainerImage }}
targetOS: android
targetArchitecture: arm
runTests: false

- template: ../jobs/vmr-build.yml
parameters:
Expand All @@ -467,7 +461,6 @@ stages:
image: ${{ variables.androidCrossContainerImage }}
targetOS: android
targetArchitecture: x64
runTests: false

- template: ../jobs/vmr-build.yml
parameters:
Expand All @@ -480,7 +473,6 @@ stages:
image: ${{ variables.androidCrossContainerImage }}
targetOS: android
targetArchitecture: x86
runTests: false

- template: ../jobs/vmr-build.yml
parameters:
Expand All @@ -495,7 +487,6 @@ stages:
targetOS: browser
targetArchitecture: wasm
extraProperties: /p:DotNetBuildRuntimeWasmEnableThreads=true
runTests: false

- template: ../jobs/vmr-build.yml
parameters:
Expand All @@ -509,7 +500,6 @@ stages:
crossRootFs: '/crossrootfs/x64'
targetOS: linux-bionic
targetArchitecture: arm64
runTests: false

- template: ../jobs/vmr-build.yml
parameters:
Expand All @@ -523,7 +513,6 @@ stages:
crossRootFs: '/crossrootfs/x64'
targetOS: linux-bionic
targetArchitecture: arm
runTests: false

- template: ../jobs/vmr-build.yml
parameters:
Expand All @@ -537,7 +526,6 @@ stages:
crossRootFs: '/crossrootfs/x64'
targetOS: linux-bionic
targetArchitecture: x64
runTests: false

- template: ../jobs/vmr-build.yml
parameters:
Expand All @@ -547,7 +535,6 @@ stages:
pool: ${{ parameters.pool_Mac }}
targetOS: ios
targetArchitecture: arm64
runTests: false

- template: ../jobs/vmr-build.yml
parameters:
Expand All @@ -557,7 +544,6 @@ stages:
pool: ${{ parameters.pool_Mac }}
targetOS: iossimulator
targetArchitecture: x64
runTests: false

- template: ../jobs/vmr-build.yml
parameters:
Expand All @@ -567,7 +553,6 @@ stages:
pool: ${{ parameters.pool_Mac }}
targetOS: maccatalyst
targetArchitecture: arm64
runTests: false

- template: ../jobs/vmr-build.yml
parameters:
Expand All @@ -577,7 +562,6 @@ stages:
pool: ${{ parameters.pool_Mac }}
targetOS: maccatalyst
targetArchitecture: x64
runTests: false

- template: ../jobs/vmr-build.yml
parameters:
Expand All @@ -587,7 +571,6 @@ stages:
pool: ${{ parameters.pool_Mac }}
targetOS: tvos
targetArchitecture: arm64
runTests: false

- template: ../jobs/vmr-build.yml
parameters:
Expand All @@ -597,7 +580,6 @@ stages:
pool: ${{ parameters.pool_Mac }}
targetOS: tvossimulator
targetArchitecture: arm64
runTests: false

- template: ../jobs/vmr-build.yml
parameters:
Expand All @@ -607,7 +589,6 @@ stages:
pool: ${{ parameters.pool_Mac }}
targetOS: tvossimulator
targetArchitecture: x64
runTests: false

- template: ../jobs/vmr-build.yml
parameters:
Expand All @@ -621,7 +602,6 @@ stages:
crossRootFs: '/crossrootfs/x64'
targetOS: wasi
targetArchitecture: wasm
runTests: false

- template: ../jobs/vmr-build.yml
parameters:
Expand Down Expand Up @@ -658,7 +638,6 @@ stages:
targetOS: linux
targetArchitecture: x64
extraProperties: /p:PgoInstrument=true
runTests: false
sign: false

- template: ../jobs/vmr-build.yml
Expand All @@ -675,7 +654,6 @@ stages:
targetOS: linux
targetArchitecture: x64
extraProperties: /p:DotNetBuildMonoEnableLLVM=true /p:DotNetBuildMonoAOTEnableLLVM=true /p:DotNetBuildMonoBundleLLVMOptimizer=true
runTests: false

- template: ../jobs/vmr-build.yml
parameters:
Expand Down Expand Up @@ -716,7 +694,6 @@ stages:
targetOS: linux
targetArchitecture: arm64
extraProperties: /p:PgoInstrument=true
runTests: false
sign: false

- template: ../jobs/vmr-build.yml
Expand Down Expand Up @@ -775,7 +752,6 @@ stages:
targetOS: linux
targetArchitecture: arm64
extraProperties: /p:DotNetBuildMonoEnableLLVM=true /p:DotNetBuildMonoAOTEnableLLVM=true /p:DotNetBuildMonoBundleLLVMOptimizer=true
runTests: false

- template: ../jobs/vmr-build.yml
parameters:
Expand Down Expand Up @@ -813,7 +789,6 @@ stages:
targetOS: windows
targetArchitecture: x64
extraProperties: /p:PgoInstrument=true
runTests: false
sign: false

- template: ../jobs/vmr-build.yml
Expand All @@ -825,7 +800,6 @@ stages:
targetOS: windows
targetArchitecture: x86
extraProperties: /p:PgoInstrument=true
runTests: false
sign: false

- template: ../jobs/vmr-build.yml
Expand All @@ -837,7 +811,6 @@ stages:
targetOS: windows
targetArchitecture: arm64
extraProperties: /p:PgoInstrument=true
runTests: false
sign: false

# Build Pass 2 verticals
Expand Down
6 changes: 3 additions & 3 deletions src/SourceBuild/content/test/tests.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
cross-build of using Mariner to build for Alpine (linux vs linux-musl). -->
<_RunScenarioTests Condition="'$(BuildOS)' != 'windows' and '$(DotNetBuildSourceOnly)' != 'true' and '$(__PortableTargetOS.ToLowerInvariant())' != '$(TargetOS.ToLowerInvariant())'">false</_RunScenarioTests>

<!-- The scenario tests are not supported when unofficial build versioning is used. -->
<_RunScenarioTests Condition="'$(UseOfficialBuildVersioning)' == 'false'">false</_RunScenarioTests>
<!-- Short stack builds can't run scenario-tests as no SDK gets produced. -->
<_RunScenarioTests Condition="'$(ShortStack)' == 'true' or '$(PgoInstrument)' == 'true'">false</_RunScenarioTests>
</PropertyGroup>

<ItemGroup>
Expand All @@ -34,7 +34,7 @@
<!-- Make sure that the sdk archive is extracted before running the scenario-tests. Need to do this here as it's hard
to define the dependency directly in scenario-tests.proj. -->
<ItemGroup>
<ProjectReference Include="$(RepositoryEngineeringDir)extract-sdk-archive.proj" BuildInParallel="false" Condition="'$(SkipPrepareSdkArchive)' != 'true'" />
<ProjectReference Include="$(RepositoryEngineeringDir)extract-sdk-archive.proj" BuildInParallel="false" Condition="'$(_RunScenarioTests)' == 'true' and '$(SkipPrepareSdkArchive)' != 'true'" />
<ProjectReference Include="$(RepoProjectsDir)scenario-tests.proj" Condition="'$(_RunScenarioTests)' == 'true'" BuildInParallel="false" />
</ItemGroup>

Expand Down
Loading