Skip to content

Skip more OS's for AOT tests #48090

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 5, 2023
Merged

Skip more OS's for AOT tests #48090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
059a67d
Skip more OS's for AOT tests
BrennanConroy May 5, 2023
8e6b94b
Update GrpcTemplateTest.cs
BrennanConroy May 5, 2023
7878002
Update HelixConstants.cs
BrennanConroy May 5, 2023
dd8abe2
Apply suggestions from code review
BrennanConroy May 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/ProjectTemplates/test/Templates.Tests/ApiTemplateTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public async Task ApiTemplateCSharp()
}

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

[ConditionalFact]
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478", Queues = "OSX.13.Amd64.Open;Ubuntu.2004.Amd64.Open;Windows.11.Amd64.Client.Open;")]
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478", Queues = HelixConstants.NativeAotNotSupportedHelixQueues)]
public async Task ApiTemplateProgramMainNativeAotCSharp()
{
await ApiTemplateCore(languageOverride: null, args: new[] { ArgConstants.UseProgramMain, ArgConstants.PublishNativeAot });
Expand Down
4 changes: 2 additions & 2 deletions src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public async Task GrpcTemplate()

// TODO (https://github.com/dotnet/aspnetcore/issues/47336): Don't skip on macos 11
[ConditionalFact]
[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)]
[SkipOnHelix("Not supported queues", Queues = HelixConstants.NativeAotNotSupportedHelixQueues)]
[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.
public async Task GrpcTemplateNativeAot()
{
Expand All @@ -63,7 +63,7 @@ public async Task GrpcTemplateProgramMain()

// TODO (https://github.com/dotnet/aspnetcore/issues/47336): Don't skip on macos 11
[ConditionalFact]
[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)]
[SkipOnHelix("Not supported queues", Queues = HelixConstants.NativeAotNotSupportedHelixQueues)]
[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.
public async Task GrpcTemplateProgramMainNativeAot()
{
Expand Down
1 change: 1 addition & 0 deletions src/Testing/src/xunit/HelixConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ public static class HelixConstants
public const string DebianAmd64 = "Debian.11.Amd64.Open;";
public const string DebianArm64 = "Debian.11.Arm64.Open;";
public const string AlmaLinuxAmd64 = "(AlmaLinux.8.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-helix-amd64;";
public const string NativeAotNotSupportedHelixQueues = "All.OSX;All.Ubuntu;Windows.11.Amd64.Client.Open;Windows.Amd64.Server2022.Open;windows.11.arm64.open";
}