Skip to content

Commit 36e0ada

Browse files
authored
Disable tests that consistently fail in the VM queues for performance-ci runs, but keep them for internal runs. (#5001)
1 parent 3b8b76f commit 36e0ada

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

eng/performance/scenarios.proj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,15 @@
3131
<ScenarioDirectoryName>emptyvbconsoletemplate</ScenarioDirectoryName>
3232
<PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
3333
</Scenario>
34-
<UIScenario Include="Static Winforms Template" Condition="'$(TargetsWindows)' == 'true' AND '$(OS)' == 'Windows_NT'">
34+
<!-- Static Winforms Template: limited to internal (SYSTEM_TEAMPROJECT=internal) runs due to flakiness (CloseFailed) on generic CI VMs.
35+
Override with /p:IncludeVMFlakyScenarios=true to include on other builds. -->
36+
<UIScenario Include="Static Winforms Template" Condition="'$(TargetsWindows)' == 'true' AND '$(OS)' == 'Windows_NT' AND ( '$(SYSTEM_TEAMPROJECT)' == 'internal' OR '$(IncludeVMFlakyScenarios)' == 'true' )">
3537
<ScenarioDirectoryName>staticwinformstemplate</ScenarioDirectoryName>
3638
<PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
3739
</UIScenario>
38-
<UIScenario Include="WinForms Large" Condition="'$(TargetsWindows)' == 'true' AND '$(OS)' == 'Windows_NT'">
40+
<!-- WinForms Large: gated for consistency with Static Winforms Template.
41+
Override with /p:IncludeVMFlakyScenarios=true to include on other builds. -->
42+
<UIScenario Include="WinForms Large" Condition="'$(TargetsWindows)' == 'true' AND '$(OS)' == 'Windows_NT' AND ( '$(SYSTEM_TEAMPROJECT)' == 'internal' OR '$(IncludeVMFlakyScenarios)' == 'true' )">
3943
<ScenarioDirectoryName>windowsformslarge</ScenarioDirectoryName>
4044
<PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
4145
</UIScenario>

eng/performance/sdk_scenarios.proj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<Import Project="Scenarios.Common.props" />
44

5+
56
<ItemGroup>
67
<Framework Include="netcoreapp2.1" FrameworkName="%(Identity)"/>
78
<Framework Include="netcoreapp3.0" FrameworkName="%(Identity)" Condition="'$(FrameworkVersion)' &gt; '2.1'"/>
@@ -168,7 +169,9 @@
168169
<Command>$(Python) test.py innerloopmsbuild --scenario-name &quot;%(Identity)&quot; $(ScenarioArgs)</Command>
169170
<PostCommands>$(Python) post.py</PostCommands>
170171
</HelixWorkItem>
171-
<HelixWorkItem Include="Inner Loop Blazor Client">
172+
<!-- Inner Loop Blazor Client: gated to internal (SYSTEM_TEAMPROJECT=internal) by default due to higher resource usage.
173+
Override with /p:IncludeVMFlakyScenarios=true to include elsewhere. -->
174+
<HelixWorkItem Include="Inner Loop Blazor Client" Condition="'$(SYSTEM_TEAMPROJECT)' == 'internal' OR '$(IncludeVMFlakyScenarios)' == 'true'">
172175
<ScenarioDirectoryName>blazorwasminnerloop</ScenarioDirectoryName>
173176
<PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
174177
<PreCommands>$(Python) pre.py default -f $(PERFLAB_Framework)</PreCommands>

0 commit comments

Comments
 (0)