Skip to content

Commit 6eadf9f

Browse files
mthalmanmthalman
authored
Enable scenario test execution in VMR build (#19222)
1 parent e813718 commit 6eadf9f

File tree

14 files changed

+212
-16
lines changed

14 files changed

+212
-16
lines changed

‎eng/pipelines/templates/jobs/vmr-build.yml‎

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ jobs:
370370
set -ex
371371
372372
dockerVolumeArgs="-v $(sourcesPath):/vmr"
373-
sourceOnlyArgs=''
373+
customBuildArgs=''
374374
extraBuildProperties=''
375375
376376
if [[ ! -z '${{ parameters.targetOS }}' ]]; then
@@ -381,11 +381,15 @@ jobs:
381381
extraBuildProperties="$extraBuildProperties /p:TargetArchitecture=${{ parameters.targetArchitecture }}"
382382
fi
383383
384+
if [[ '${{ parameters.useDevVersions }}' == 'True' ]]; then
385+
customBuildArgs="$customBuildArgs --dev"
386+
fi
387+
384388
if [[ '${{ parameters.buildSourceOnly }}' == 'True' ]]; then
385389
if [[ '${{ parameters.enablePoison }}' == 'True' ]]; then
386-
sourceOnlyArgs='--poison'
390+
customBuildArgs="$customBuildArgs --poison"
387391
fi
388-
sourceOnlyArgs="$sourceOnlyArgs --source-only /p:SmokeTestsWarnOnSdkContentDiffs=true /p:SmokeTestsExcludeOmniSharpTests=${{ parameters.excludeOmniSharpTests }}"
392+
customBuildArgs="$customBuildArgs --source-only /p:SmokeTestsWarnOnSdkContentDiffs=true /p:SmokeTestsExcludeOmniSharpTests=${{ parameters.excludeOmniSharpTests }}"
389393
fi
390394
391395
if [[ -n "${{ parameters.extraProperties }}" ]]; then
@@ -394,10 +398,10 @@ jobs:
394398
395399
# Only use Docker when a container is specified
396400
if [[ -n "${{ parameters.container }}" ]]; then
397-
docker run --rm $dockerVolumeArgs -w /vmr ${{ parameters.container }} ./build.sh /bl:artifacts/log/Release/Test.binlog --test $sourceOnlyArgs $extraBuildProperties $(additionalBuildArgs)
401+
docker run --rm $dockerVolumeArgs -w /vmr ${{ parameters.container }} ./build.sh /bl:artifacts/log/Release/Test.binlog --test $customBuildArgs $extraBuildProperties $(additionalBuildArgs)
398402
else
399403
cd $(sourcesPath)
400-
./build.sh /bl:artifacts/log/Release/Test.binlog --test $sourceOnlyArgs $extraBuildProperties $(additionalBuildArgs)
404+
./build.sh /bl:artifacts/log/Release/Test.binlog --test $customBuildArgs $extraBuildProperties $(additionalBuildArgs)
401405
fi
402406
403407
displayName: Run Tests
@@ -424,6 +428,10 @@ jobs:
424428
CopyWithRelativeFolders "src/" $targetFolder "*.binlog"
425429
CopyWithRelativeFolders "src/" $targetFolder "*.log"
426430
431+
if (Test-Path "artifacts/scenario-tests/") {
432+
CopyWithRelativeFolders "artifacts/scenario-tests/" $targetFolder "*.binlog"
433+
}
434+
427435
if (Test-Path "artifacts/TestResults/*") {
428436
CopyWithRelativeFolders "artifacts/TestResults/" $targetFolder "*.binlog"
429437
CopyWithRelativeFolders "artifacts/TestResults/" $targetFolder "*.diff"
@@ -451,6 +459,7 @@ jobs:
451459
cd "$(sourcesPath)"
452460
find artifacts/log/ -type f -name "*.binlog" -exec rsync -R {} -t ${targetFolder} \;
453461
find artifacts/log/ -type f -name "*.log" -exec rsync -R {} -t ${targetFolder} \;
462+
[ -d "artifacts/scenario-tests/" ] && find artifacts/scenario-tests/ -type f -name "*.binlog" -exec rsync -R {} -t ${targetFolder} \;
454463
find artifacts/TestResults/ -type f -name "*.binlog" -exec rsync -R {} -t ${targetFolder} \;
455464
find artifacts/TestResults/ -type f -name "*.diff" -exec rsync -R {} -t ${targetFolder} \;
456465
find artifacts/TestResults/ -type f -name "Updated*.txt" -exec rsync -R {} -t ${targetFolder} \;
@@ -486,13 +495,25 @@ jobs:
486495
condition: succeededOrFailed()
487496
continueOnError: true
488497
inputs:
489-
testRunner: vSTest
498+
testRunner: VSTest
490499
testResultsFiles: 'artifacts/TestResults/Release/*.trx'
491500
searchFolder: $(sourcesPath)
492501
mergeTestResults: true
493502
publishRunAttachments: true
494503
testRunTitle: Tests_$(Agent.JobName)
495504

505+
- task: PublishTestResults@2
506+
displayName: Publish Scenario Test Results
507+
condition: succeededOrFailed()
508+
continueOnError: true
509+
inputs:
510+
testRunner: xUnit
511+
testResultsFiles: 'artifacts/TestResults/**/scenario-tests/*.xml'
512+
searchFolder: $(sourcesPath)
513+
mergeTestResults: true
514+
publishRunAttachments: true
515+
testRunTitle: ScenarioTests_$(Agent.JobName)
516+
496517
- task: CopyFiles@2
497518
inputs:
498519
SourceFolder: $(sourcesPath)/artifacts

‎eng/pipelines/templates/stages/vmr-build.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ stages:
123123
artifactsRid: alpine.3.19-x64
124124
pool: ${{ parameters.pool_Linux }}
125125
container: ${{ variables.alpine319Container }}
126+
targetOS: linux-musl
126127
buildFromArchive: false # 🚫
127128
buildSourceOnly: true # ✅
128129
enablePoison: true # ✅
@@ -143,6 +144,7 @@ stages:
143144
architecture: x64
144145
pool: ${{ parameters.pool_Linux }}
145146
container: ${{ variables.alpine319Container }}
147+
targetOS: linux-musl
146148
buildFromArchive: false # 🚫
147149
buildSourceOnly: true # ✅
148150
enablePoison: false # 🚫

‎src/SourceBuild/content/Directory.Build.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@
160160
<IntermediateSymbolsRootDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', 'Symbols'))</IntermediateSymbolsRootDir>
161161
<AssetManifestsIntermediateDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', 'AssetManifests'))</AssetManifestsIntermediateDir>
162162
<ArtifactsAssetsDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'assets', '$(Configuration)'))</ArtifactsAssetsDir>
163+
<DotNetSdkExtractDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', 'extracted-dotnet-sdk'))</DotNetSdkExtractDir>
163164

164165
<PrebuiltPackagesPath>$([MSBuild]::NormalizeDirectory('$(PrereqsPackagesDir)', 'prebuilt'))</PrebuiltPackagesPath>
165166
<PreviouslyRestoredPackagesPath>$([MSBuild]::NormalizeDirectory('$(PrereqsPackagesDir)', 'previouslyRestored'))</PreviouslyRestoredPackagesPath>

‎src/SourceBuild/content/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ while [[ $# > 0 ]]; do
162162
;;
163163

164164
# Advanced settings
165-
-build-tests)
165+
-build-repo-tests)
166166
properties="$properties /p:DotNetBuildTests=true"
167167
;;
168168
-ci)

‎src/SourceBuild/content/eng/extract-sdk-archive.proj‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<Project Sdk="Microsoft.Build.NoTargets">
2+
3+
<PropertyGroup>
4+
<TargetFramework>$(NetCurrent)</TargetFramework>
5+
</PropertyGroup>
6+
7+
<Target Name="ExtractSdkArchive"
8+
BeforeTargets="AfterBuild"
9+
DependsOnTargets="DetermineSourceBuiltSdkVersion"
10+
Inputs="$(SdkTarballPath)"
11+
Outputs="$(DotNetSdkExtractDir)">
12+
<MakeDir Directories="$(DotNetSdkExtractDir)" />
13+
<Exec Condition="'$(ArchiveExtension)' == '.tar.gz'"
14+
Command="tar -xzf $(SdkTarballPath) -C $(DotNetSdkExtractDir)" />
15+
<Unzip Condition="'$(ArchiveExtension)' == '.zip'"
16+
SourceFiles="$(SdkTarballPath)"
17+
DestinationFolder="$(DotNetSdkExtractDir)" />
18+
</Target>
19+
20+
</Project>

‎src/SourceBuild/content/eng/finish-source-only.proj‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<ItemGroup>
1111
<ProjectReference Include="$(TasksDir)Microsoft.DotNet.UnifiedBuild.Tasks\Microsoft.DotNet.UnifiedBuild.Tasks.csproj" />
1212
<ProjectReference Include="$(TasksDir)Microsoft.DotNet.SourceBuild.Tasks.LeakDetection\Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj" />
13+
<ProjectReference Include="$(RepositoryEngineeringDir)extract-sdk-archive.proj" />
1314
<ProjectReference Include="$(RepositoryEngineeringDir)merge-asset-manifests.proj" />
1415
</ItemGroup>
1516

@@ -59,13 +60,9 @@
5960
Outputs="$(SdkSymbolsTarball)">
6061
<PropertyGroup>
6162
<IntermediateSdkSymbolsLayout>$(BaseIntermediateOutputPath)SdkSymbols</IntermediateSdkSymbolsLayout>
62-
<IntermediateSdkLayout>$(BaseIntermediateOutputPath)Sdk</IntermediateSdkLayout>
6363
</PropertyGroup>
6464

65-
<MakeDir Directories="$(IntermediateSdkLayout)" />
66-
<Exec Command="tar -xzf $(SdkTarballPath) -C $(IntermediateSdkLayout)" />
67-
68-
<CreateSdkSymbolsLayout SdkLayoutPath="$(IntermediateSdkLayout)"
65+
<CreateSdkSymbolsLayout SdkLayoutPath="$(DotNetSdkExtractDir)"
6966
AllSymbolsPath="$(IntermediateSymbolsRootDir)"
7067
SdkSymbolsLayoutPath="$(IntermediateSdkSymbolsLayout)"
7168
FailOnMissingPDBs="false" />
@@ -76,7 +73,6 @@
7673
<Message Importance="High" Text="Packaged sdk symbols in '$(SdkSymbolsTarball)'" />
7774

7875
<RemoveDir Directories="$(IntermediateSdkSymbolsLayout)" />
79-
<RemoveDir Directories="$(IntermediateSdkLayout)" />
8076
</Target>
8177

8278
<!--

‎src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/CreateSdkSymbolsLayout.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,9 @@ private IList<string> GenerateSymbolsLayout(Hashtable allPdbGuids)
8989
{
9090
// Copy matching pdb to symbols path, preserving sdk binary's hierarchy
9191
string sourcePath = (string)allPdbGuids[debugId]!;
92+
string fileRelativePath = file.Substring(SdkLayoutPath.Length);
9293
string destinationPath =
93-
file.Replace(SdkLayoutPath, SdkSymbolsLayoutPath)
94+
Path.Combine(SdkSymbolsLayoutPath, fileRelativePath)
9495
.Replace(Path.GetFileName(file), Path.GetFileName(sourcePath));
9596

9697
Directory.CreateDirectory(Path.GetDirectoryName(destinationPath)!);

‎src/SourceBuild/content/repo-projects/Directory.Build.props‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,17 @@
9494
<BuildArgs>$(BuildArgs) /p:ReferencePackageNupkgCacheDir="$(ReferencePackagesDir)"</BuildArgs>
9595
</PropertyGroup>
9696

97+
<PropertyGroup>
98+
<TestActions>$(FlagParameterPrefix)restore</TestActions>
99+
<TestActions>$(TestActions) $(FlagParameterPrefix)test</TestActions>
100+
101+
<TestArgs Condition="'$(UseOfficialBuildVersioning)' != 'false'">$(FlagParameterPrefix)ci</TestArgs>
102+
<TestArgs>$(TestArgs) $(FlagParameterPrefix)configuration $(Configuration)</TestArgs>
103+
<TestArgs>$(TestArgs) /bl:artifacts/log/$(Configuration)/Test.binlog</TestArgs>
104+
105+
<TestCommand>$(BuildScript) $(TestActions) $(TestArgs)</TestCommand>
106+
</PropertyGroup>
107+
97108
<PropertyGroup Condition="'$(EnableExtraDebugging)' == 'true'">
98109
<MSBuildDebugPathTargetDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'msbuild-debug'))</MSBuildDebugPathTargetDir>
99110
<RoslynDebugPathTargetDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'roslyn-debug'))</RoslynDebugPathTargetDir>

‎src/SourceBuild/content/repo-projects/scenario-tests.proj‎

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.Build.NoTargets">
1+
<Project Sdk="Microsoft.Build.NoTargets" TreatAsLocalProperty="CleanWhileBuilding">
22

33
<ItemGroup>
44
<RepositoryReference Include="arcade" />
@@ -10,4 +10,57 @@
1010
<RepositoryReference Include="source-build-reference-packages" />
1111
</ItemGroup>
1212

13+
<PropertyGroup>
14+
<!-- The scenario-tests repo shouldn't be cleaned after building as we run tests from it. -->
15+
<CleanWhileBuilding>false</CleanWhileBuilding>
16+
17+
<ScenarioTestsArtifactsDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'scenario-tests'))</ScenarioTestsArtifactsDir>
18+
<ScenarioTestsResultsDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsTestResultsDir)', 'scenario-tests'))</ScenarioTestsResultsDir>
19+
<_ScenarioTestsNuGetConfig>$(ScenarioTestsArtifactsDir)NuGet.config</_ScenarioTestsNuGetConfig>
20+
<_InstallerNuGetConfig>$([MSBuild]::NormalizePath('$(SrcDir)', 'installer', 'NuGet.config'))</_InstallerNuGetConfig>
21+
</PropertyGroup>
22+
23+
<Target Name="SetupNuGetConfig"
24+
Inputs="$(_InstallerNuGetConfig)"
25+
Outputs="$(_ScenarioTestsNuGetConfig)">
26+
27+
<Copy SourceFiles="$(_InstallerNuGetConfig)"
28+
DestinationFiles="$(_ScenarioTestsNuGetConfig)" />
29+
30+
</Target>
31+
32+
<Target Name="RunScenarioTests"
33+
DependsOnTargets="SetupNuGetConfig;DetermineSourceBuiltSdkVersion">
34+
35+
<PropertyGroup>
36+
<_CurrentDateTime>$([System.DateTime]::Now.ToString("yyyy-MM-dd_HH_mm_ss"))</_CurrentDateTime>
37+
<_TestXmlOutputPath>$(ScenarioTestsResultsDir)$(_CurrentDateTime).xml</_TestXmlOutputPath>
38+
<_ScenarioTestsAdditionalArgs>--xml $(_TestXmlOutputPath) --target-rid $(TargetRid) --no-cleanup --no-traits Category=MultiTFM</_ScenarioTestsAdditionalArgs>
39+
40+
<!-- Define the test root as a sub-directory of the scenario test artifacts directory. It needs to be a sub-directory because the scenario test execution
41+
will clean that directory. Since we need the NuGet.config file that we copied in to be preserved, that's stored in the directory above the test root. -->
42+
<_TestRoot>$(ScenarioTestsArtifactsDir)artifacts/</_TestRoot>
43+
44+
<!-- It's necessary to explicitly define the path to the dotnet tool to prevent Arcade from attempting to derive it. Otherwise, it will run the dotnet
45+
install script to get a new one. We must use the locally built SDK instead in order to support non-portable RIDs for source build. -->
46+
<_DotNetTool>$(DotNetSdkExtractDir)$([System.IO.Path]::GetFileName('$(DotNetTool)'))</_DotNetTool>
47+
</PropertyGroup>
48+
49+
<MakeDir Directories="$(ScenarioTestsResultsDir)" />
50+
51+
<ItemGroup>
52+
<_ScenarioTestEnvVars Include="
53+
TestRoot=$(_TestRoot);
54+
DotNetRoot=$(DotNetSdkExtractDir);
55+
TestSdkVersion=$(SourceBuiltSdkVersion);
56+
AdditionalTestArgs=$(_ScenarioTestsAdditionalArgs);
57+
DotNetTool=$(_DotNetTool);
58+
_InitializeDotNetCli=$(DotNetSdkExtractDir)" />
59+
</ItemGroup>
60+
61+
<Exec Command="$(TestCommand)"
62+
WorkingDirectory="$(ProjectDirectory)"
63+
EnvironmentVariables="@(_ScenarioTestEnvVars)" />
64+
</Target>
65+
1366
</Project>

‎src/SourceBuild/content/test/scenario-tests/Directory.Build.targets‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Project>
2+
3+
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets, $(MSBuildThisFileDirectory)..))" />
4+
5+
<!-- scenario-tests test execution requires a custom test target. -->
6+
<Target Name="Test" DependsOnTargets="RunScenarioTests" />
7+
<Target Name="VSTest" DependsOnTargets="RunScenarioTests" />
8+
9+
</Project>

0 commit comments

Comments
 (0)