@@ -29,15 +29,8 @@ parameters:
2929 values :
3030 - Production
3131 - Staging
32- - name : E2EPart1AgentCleanup
33- displayName : Delete or keep E2E Part 1 machine for debugging
34- type : string
35- default : delete
36- values :
37- - delete
38- - stop
39- - name : E2EPart2AgentCleanup
40- displayName : Delete or keep E2E Part 2 machine for debugging
32+ - name : E2EAgentCleanup
33+ displayName : Delete or keep E2E machine for debugging
4134 type : string
4235 default : delete
4336 values :
@@ -88,31 +81,10 @@ stages:
8881 parameters :
8982 enableApexBlameHangDumpCollector : ${{parameters.EnableApexBlameHangDumpCollector}}
9083
91- # Dartlab's template defines this in its own stage
92- - template : vs-test/end_to_end.yml
93- parameters :
94- stageName : VS_EndToEnd_Part1
95- stageDisplayName : Part 1
96- condition : " and(succeeded(), ne(variables['RunEndToEndTests'], 'false'))"
97- dependsOn :
98- - Build
99- variables :
100- - name : VsBootstrapperUrl
101- value : $[stageDependencies.Build.Build.outputs['dartlab_variables.bootstrapperUrl']]
102- - name : RunSettingsDrop
103- value : $[stageDependencies.Build.Build.outputs['dartlab_variables.RunSettingsDrop']]
104- bootstrapperUrl : $(VsBootstrapperUrl)
105- DartLabEnvironment : ${{parameters.DartLabEnvironment}}
106- part : " InstallPackageTest.ps1,UninstallPackageTest.ps1,UpdatePackageTest.ps1"
107- runSettingsURI : https://vsdrop.corp.microsoft.com/file/v1/$(RunSettingsDrop);NuGet.Tests.Apex.runsettings
108- testExecutionJobTimeoutInMinutes : 100
109- testMachineCleanUpStrategy : ${{parameters.E2EPart1AgentCleanup}}
110-
111- # Dartlab's template defines this in its own stage
11284- template : vs-test/end_to_end.yml
11385 parameters :
114- stageName : VS_EndToEnd_Part2
115- stageDisplayName : Part 2
86+ stageName : VS_EndToEnd
87+ stageDisplayName : On Windows
11688 condition : " and(succeeded(), ne(variables['RunEndToEndTests'], 'false'))"
11789 dependsOn :
11890 - Build
@@ -123,10 +95,9 @@ stages:
12395 value : $[stageDependencies.Build.Build.outputs['dartlab_variables.RunSettingsDrop']]
12496 bootstrapperUrl : $(VsBootstrapperUrl)
12597 DartLabEnvironment : ${{parameters.DartLabEnvironment}}
126- part : " BuildIntegratedTest.ps1,ExecuteInitScriptTest.ps1,FindPackageTest.ps1,GetPackageTest.ps1,GetProjectTest.ps1,LegacyPackageRefProjectTest.ps1,NativeProjectTest.ps1,NetCoreProjectTest.ps1,PackTest.ps1,ProjectRetargeting.ps1,ServicesTest.ps1,Settings.ps1,SyncPackageTest.ps1,TabExpansionTest.ps1,UniversalWindowsProjectTest.ps1"
12798 runSettingsURI : https://vsdrop.corp.microsoft.com/file/v1/$(RunSettingsDrop);NuGet.Tests.Apex.runsettings
12899 testExecutionJobTimeoutInMinutes : 100
129- testMachineCleanUpStrategy : ${{parameters.E2EPart2AgentCleanup }}
100+ testMachineCleanUpStrategy : ${{parameters.E2EAgentCleanup }}
130101
131102# Dartlab's template defines this in its own stage
132103- template : vs-test/apex.yml
@@ -144,5 +115,7 @@ stages:
144115 bootstrapperUrl : $(bootstrapperUrl)
145116 runSettingsURI : https://vsdrop.corp.microsoft.com/file/v1/$(RunSettingsDrop);NuGet.Tests.Apex.runsettings
146117 testExecutionJobTimeoutInMinutes : 412 # cloud test minimum
118+ testMachineTotalCount : ' 2'
119+ testCaseDistributionBatchingStrategy : OptimizeDurationForPerformance
147120 testDeploymentCleanupMode : ${{parameters.ApexAgentCleanup}}
148121 VsBootstrapperBranch : $(VsBootstrapperBranch)
0 commit comments