From edea79041cb4f3906142fff4e42940146e38493f Mon Sep 17 00:00:00 2001 From: Brennan Date: Fri, 5 May 2023 12:42:11 -0700 Subject: [PATCH] Skip more OS's for AOT tests (#48090) --- src/ProjectTemplates/test/Templates.Tests/ApiTemplateTest.cs | 4 ++-- src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs | 4 ++-- src/Testing/src/xunit/HelixConstants.cs | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ProjectTemplates/test/Templates.Tests/ApiTemplateTest.cs b/src/ProjectTemplates/test/Templates.Tests/ApiTemplateTest.cs index a5ae170d9178..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 = "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 }); @@ -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 }); diff --git a/src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs b/src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs index ad6c6fafe780..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 = "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() { @@ -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() { 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"; }