Skip to content

Commit edea790

Browse files
Skip more OS's for AOT tests (#48090)
1 parent a5833f7 commit edea790

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

src/ProjectTemplates/test/Templates.Tests/ApiTemplateTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public async Task ApiTemplateCSharp()
3737
}
3838

3939
[ConditionalFact]
40-
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478", Queues = "OSX.13.Amd64.Open;Ubuntu.2004.Amd64.Open;Windows.11.Amd64.Client.Open;")]
40+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478", Queues = HelixConstants.NativeAotNotSupportedHelixQueues)]
4141
public async Task ApiTemplateNativeAotCSharp()
4242
{
4343
await ApiTemplateCore(languageOverride: null, args: new[] { ArgConstants.PublishNativeAot });
@@ -50,7 +50,7 @@ public async Task ApiTemplateProgramMainCSharp()
5050
}
5151

5252
[ConditionalFact]
53-
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478", Queues = "OSX.13.Amd64.Open;Ubuntu.2004.Amd64.Open;Windows.11.Amd64.Client.Open;")]
53+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478", Queues = HelixConstants.NativeAotNotSupportedHelixQueues)]
5454
public async Task ApiTemplateProgramMainNativeAotCSharp()
5555
{
5656
await ApiTemplateCore(languageOverride: null, args: new[] { ArgConstants.UseProgramMain, ArgConstants.PublishNativeAot });

src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public async Task GrpcTemplate()
4545

4646
// TODO (https://github.com/dotnet/aspnetcore/issues/47336): Don't skip on macos 11
4747
[ConditionalFact]
48-
[SkipOnHelix("Not supported queues", Queues = "OSX.1100.Amd64.Open;windows.11.arm64.open;OSX.13.Amd64.Open;Ubuntu.2004.Amd64.Open;Windows.11.Amd64.Client.Open;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
48+
[SkipOnHelix("Not supported queues", Queues = HelixConstants.NativeAotNotSupportedHelixQueues)]
4949
[SkipOnAlpine("https://github.com/grpc/grpc/issues/18338")] // protoc doesn't support Alpine. Note that the issue was closed with a workaround which isn't applied to our OS image.
5050
public async Task GrpcTemplateNativeAot()
5151
{
@@ -63,7 +63,7 @@ public async Task GrpcTemplateProgramMain()
6363

6464
// TODO (https://github.com/dotnet/aspnetcore/issues/47336): Don't skip on macos 11
6565
[ConditionalFact]
66-
[SkipOnHelix("Not supported queues", Queues = "OSX.1100.Amd64.Open;windows.11.arm64.open;OSX.13.Amd64.Open;Ubuntu.2004.Amd64.Open;Windows.11.Amd64.Client.Open;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
66+
[SkipOnHelix("Not supported queues", Queues = HelixConstants.NativeAotNotSupportedHelixQueues)]
6767
[SkipOnAlpine("https://github.com/grpc/grpc/issues/18338")] // protoc doesn't support Alpine. Note that the issue was closed with a workaround which isn't applied to our OS image.
6868
public async Task GrpcTemplateProgramMainNativeAot()
6969
{

src/Testing/src/xunit/HelixConstants.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ public static class HelixConstants
99
public const string DebianAmd64 = "Debian.11.Amd64.Open;";
1010
public const string DebianArm64 = "Debian.11.Arm64.Open;";
1111
public const string AlmaLinuxAmd64 = "(AlmaLinux.8.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:almalinux-8-helix-amd64;";
12+
public const string NativeAotNotSupportedHelixQueues = "All.OSX;All.Ubuntu;Windows.11.Amd64.Client.Open;Windows.Amd64.Server2022.Open;windows.11.arm64.open";
1213
}

0 commit comments

Comments
 (0)