From 059a67dce4f6923037216d2bf8199fba77668457 Mon Sep 17 00:00:00 2001 From: Brennan Date: Fri, 5 May 2023 10:58:50 -0700 Subject: [PATCH 1/4] Skip more OS's for AOT tests --- src/ProjectTemplates/test/Templates.Tests/ApiTemplateTest.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ProjectTemplates/test/Templates.Tests/ApiTemplateTest.cs b/src/ProjectTemplates/test/Templates.Tests/ApiTemplateTest.cs index a5ae170d9178..ec7b515c8b26 100644 --- a/src/ProjectTemplates/test/Templates.Tests/ApiTemplateTest.cs +++ b/src/ProjectTemplates/test/Templates.Tests/ApiTemplateTest.cs @@ -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 = "All.OSX;All.Ubuntu;Windows.11.Amd64.Client.Open;Windows.Amd64.Server2022.Open;windows.11.arm64.open")] public async Task ApiTemplateNativeAotCSharp() { await ApiTemplateCore(languageOverride: null, args: new[] { ArgConstants.PublishNativeAot }); @@ -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 = "All.OSX;All.Ubuntu;Windows.11.Amd64.Client.Open;Windows.Amd64.Server2022.Open;windows.11.arm64.open")] public async Task ApiTemplateProgramMainNativeAotCSharp() { await ApiTemplateCore(languageOverride: null, args: new[] { ArgConstants.UseProgramMain, ArgConstants.PublishNativeAot }); From 8e6b94bacb6956d544e0d516030d70328851abed Mon Sep 17 00:00:00 2001 From: Brennan Date: Fri, 5 May 2023 11:01:02 -0700 Subject: [PATCH 2/4] Update GrpcTemplateTest.cs --- src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs b/src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs index ad6c6fafe780..b0981f737973 100644 --- a/src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs +++ b/src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs @@ -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 = "All.OSX;All.Ubuntu;Windows.11.Amd64.Client.Open;Windows.Amd64.Server2022.Open;windows.11.arm64.open")] [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() { @@ -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 = "All.OSX;All.Ubuntu;Windows.11.Amd64.Client.Open;Windows.Amd64.Server2022.Open;windows.11.arm64.open")] [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() { From 787800285faf1cc5e4a13ed553ffd719cb4ab9bf Mon Sep 17 00:00:00 2001 From: Brennan Date: Fri, 5 May 2023 11:11:06 -0700 Subject: [PATCH 3/4] Update HelixConstants.cs --- src/Testing/src/xunit/HelixConstants.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Testing/src/xunit/HelixConstants.cs b/src/Testing/src/xunit/HelixConstants.cs index 57fe15936282..49388745615f 100644 --- a/src/Testing/src/xunit/HelixConstants.cs +++ b/src/Testing/src/xunit/HelixConstants.cs @@ -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"; } From dd8abe2db41bd9a167fbfeb028f1cd0978a0dcbc Mon Sep 17 00:00:00 2001 From: Brennan Date: Fri, 5 May 2023 11:12:23 -0700 Subject: [PATCH 4/4] Apply suggestions from code review --- src/ProjectTemplates/test/Templates.Tests/ApiTemplateTest.cs | 4 ++-- src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ProjectTemplates/test/Templates.Tests/ApiTemplateTest.cs b/src/ProjectTemplates/test/Templates.Tests/ApiTemplateTest.cs index ec7b515c8b26..1922f3516239 100644 --- a/src/ProjectTemplates/test/Templates.Tests/ApiTemplateTest.cs +++ b/src/ProjectTemplates/test/Templates.Tests/ApiTemplateTest.cs @@ -37,7 +37,7 @@ public async Task ApiTemplateCSharp() } [ConditionalFact] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478", Queues = "All.OSX;All.Ubuntu;Windows.11.Amd64.Client.Open;Windows.Amd64.Server2022.Open;windows.11.arm64.open")] + [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478", Queues = HelixConstants.NativeAotNotSupportedHelixQueues)] public async Task ApiTemplateNativeAotCSharp() { await ApiTemplateCore(languageOverride: null, args: new[] { ArgConstants.PublishNativeAot }); @@ -50,7 +50,7 @@ public async Task ApiTemplateProgramMainCSharp() } [ConditionalFact] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478", Queues = "All.OSX;All.Ubuntu;Windows.11.Amd64.Client.Open;Windows.Amd64.Server2022.Open;windows.11.arm64.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 }); diff --git a/src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs b/src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs index b0981f737973..2f4a01b39e62 100644 --- a/src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs +++ b/src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs @@ -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 = "All.OSX;All.Ubuntu;Windows.11.Amd64.Client.Open;Windows.Amd64.Server2022.Open;windows.11.arm64.open")] + [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() { @@ -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 = "All.OSX;All.Ubuntu;Windows.11.Amd64.Client.Open;Windows.Amd64.Server2022.Open;windows.11.arm64.open")] + [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() {