Add Helix queue back in and skip it on tests where it doesn't work.

mitchdenny · mitchdenny · commit 87c6f763fcf4 · 2023-04-20T16:10:26.000+10:00
diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props
@@ -29,6 +29,7 @@
       <ItemGroup>
         <HelixAvailableTargetQueue Include="Ubuntu.2004.Amd64.Open" Platform="Linux" />
         <HelixAvailableTargetQueue Include="OSX.13.Amd64.Open" Platform="OSX" />
+        <HelixAvailableTargetQueue Include="Windows.11.Amd64.Client.Open" Platform="Windows" />
         <HelixAvailableTargetQueue Include="Windows.Amd64.VS2022.Pre.Open" Platform="Windows" />
       </ItemGroup>
     </When>
diff --git a/src/ProjectTemplates/test/Templates.Tests/ApiTemplateTest.cs b/src/ProjectTemplates/test/Templates.Tests/ApiTemplateTest.cs
@@ -30,29 +30,29 @@ public ITestOutputHelper Output
     }
 
     [ConditionalFact]
-    [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478")]
+    [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478", Queues = "OSX.13.Amd64.Open;Ubuntu.2004.Amd64.Open;Windows.11.Amd64.Client.Open;")]
     public async Task ApiTemplateCSharp()
     {
         await ApiTemplateCore(languageOverride: null);
     }
 
     [ConditionalFact]
-    [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478")]
+    [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478", Queues = "OSX.13.Amd64.Open;Ubuntu.2004.Amd64.Open;Windows.11.Amd64.Client.Open;")]
     public async Task ApiTemplateNativeAotCSharp()
     {
         Assert.True(false);
         await ApiTemplateCore(languageOverride: null, args: new[] { ArgConstants.PublishNativeAot });
     }
 
     [ConditionalFact]
-    [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478")]
+    [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478", Queues = "OSX.13.Amd64.Open;Ubuntu.2004.Amd64.Open;Windows.11.Amd64.Client.Open;")]
     public async Task ApiTemplateProgramMainCSharp()
     {
         await ApiTemplateCore(languageOverride: null, args: new[] { ArgConstants.UseProgramMain });
     }
 
     [ConditionalFact]
-    [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478")]
+    [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478", Queues = "OSX.13.Amd64.Open;Ubuntu.2004.Amd64.Open;Windows.11.Amd64.Client.Open;")]
     public async Task ApiTemplateProgramMainNativeAotCSharp()
     {
         await ApiTemplateCore(languageOverride: null, args: new[] { ArgConstants.UseProgramMain, ArgConstants.PublishNativeAot });
diff --git a/src/Servers/IIS/IIS/test/Common.LongTests/ShutdownTests.cs b/src/Servers/IIS/IIS/test/Common.LongTests/ShutdownTests.cs
@@ -482,6 +482,7 @@ public async Task OutOfProcessToInProcessHostingModelSwitchWorks()
     }
 
     [ConditionalFact]
+    [SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
     public async Task ConfigurationTouchedStress_InProcess()
     {
         await ConfigurationTouchedStress(HostingModel.InProcess);
diff --git a/src/Servers/IIS/IIS/test/Common.LongTests/StartupTests.cs b/src/Servers/IIS/IIS/test/Common.LongTests/StartupTests.cs
@@ -1294,6 +1294,7 @@ public async Task PreferEnvironmentVariablesOverWebConfigWhenConfigured(HostingM
     [ConditionalFact]
     [RequiresNewHandler]
     [RequiresNewShim]
+    [SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
     public async Task ServerAddressesIncludesBaseAddress()
     {
         var appName = "\u041C\u043E\u0451\u041F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435";
diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/IISExpressShutdownTests.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/IISExpressShutdownTests.cs
@@ -41,6 +41,7 @@ public async Task ServerShutsDownWhenMainExits()
     }
 
     [ConditionalFact]
+    [SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
     public async Task ServerShutsDownWhenMainExitsStress()
     {
         var parameters = Fixture.GetBaseDeploymentParameters();

Original file line number	Diff line number	Diff line change
`@@ -30,29 +30,29 @@ public ITestOutputHelper Output`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`[ConditionalFact]`
`33`		`- [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478")]`
	`33`	`+ [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478", Queues = "OSX.13.Amd64.Open;Ubuntu.2004.Amd64.Open;Windows.11.Amd64.Client.Open;")]`
`34`	`34`	`public async Task ApiTemplateCSharp()`
`35`	`35`	`{`
`36`	`36`	`await ApiTemplateCore(languageOverride: null);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`[ConditionalFact]`
`40`		`- [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478")]`
	`40`	`+ [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478", Queues = "OSX.13.Amd64.Open;Ubuntu.2004.Amd64.Open;Windows.11.Amd64.Client.Open;")]`
`41`	`41`	`public async Task ApiTemplateNativeAotCSharp()`
`42`	`42`	`{`
`43`	`43`	`Assert.True(false);`
`44`	`44`	`await ApiTemplateCore(languageOverride: null, args: new[] { ArgConstants.PublishNativeAot });`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`[ConditionalFact]`
`48`		`- [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478")]`
	`48`	`+ [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478", Queues = "OSX.13.Amd64.Open;Ubuntu.2004.Amd64.Open;Windows.11.Amd64.Client.Open;")]`
`49`	`49`	`public async Task ApiTemplateProgramMainCSharp()`
`50`	`50`	`{`
`51`	`51`	`await ApiTemplateCore(languageOverride: null, args: new[] { ArgConstants.UseProgramMain });`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`[ConditionalFact]`
`55`		`- [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478")]`
	`55`	`+ [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478", Queues = "OSX.13.Amd64.Open;Ubuntu.2004.Amd64.Open;Windows.11.Amd64.Client.Open;")]`
`56`	`56`	`public async Task ApiTemplateProgramMainNativeAotCSharp()`
`57`	`57`	`{`
`58`	`58`	`await ApiTemplateCore(languageOverride: null, args: new[] { ArgConstants.UseProgramMain, ArgConstants.PublishNativeAot });`
Original file line number	Diff line number	Diff line change
`@@ -482,6 +482,7 @@ public async Task OutOfProcessToInProcessHostingModelSwitchWorks()`
`482`	`482`	`}`
`483`	`483`
`484`	`484`	`[ConditionalFact]`
	`485`	`+ [SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]`
`485`	`486`	`public async Task ConfigurationTouchedStress_InProcess()`
`486`	`487`	`{`
`487`	`488`	`await ConfigurationTouchedStress(HostingModel.InProcess);`
Original file line number	Diff line number	Diff line change
`@@ -1294,6 +1294,7 @@ public async Task PreferEnvironmentVariablesOverWebConfigWhenConfigured(HostingM`
`1294`	`1294`	`[ConditionalFact]`
`1295`	`1295`	`[RequiresNewHandler]`
`1296`	`1296`	`[RequiresNewShim]`
	`1297`	`+ [SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]`
`1297`	`1298`	`public async Task ServerAddressesIncludesBaseAddress()`
`1298`	`1299`	`{`
`1299`	`1300`	`var appName = "\u041C\u043E\u0451\u041F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435";`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ public async Task ServerShutsDownWhenMainExits()`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`[ConditionalFact]`
	`44`	`+ [SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]`
`44`	`45`	`public async Task ServerShutsDownWhenMainExitsStress()`
`45`	`46`	`{`
`46`	`47`	`var parameters = Fixture.GetBaseDeploymentParameters();`