Skip to content

Commit 64c3711

Browse files
authored
[main] Update Docker images, queues, etc. (#38427)
- part of dotnet/aspnetcore-internal#3950 - also touches on #36032 - update Helix queues from Alpine 3.12 to 3.14, OSX 10.14 to 10.15, and (for Arm64) Debian 9 to 11 - use OSX 11.00 when testing PRs and rolling builds; reduce 10.15 usage to scheduled runs - remove overlap (all 3 queues) between PRs / rolling builds and scheduled runs - remove quarantined-pr / quarantined-tests overlap - build source-index on `windows-latest` (not `vs2017-win2016`) - update build and Helix Docker images to latest tags - skip a test class on macOS 10.15 - #38542 nits: - don't skip unused Helix queues - remove versions from pipeline job display names - some were already outdated; rest will be confusing in the future - remove most comments about unused Helix queues
1 parent 30a1872 commit 64c3711

File tree

11 files changed

+52
-65
lines changed

11 files changed

+52
-65
lines changed

.azure/pipelines/benchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
- template: jobs/default-build.yml
1111
parameters:
1212
jobName: Windows_Build
13-
jobDisplayName: "Build only : Windows"
13+
jobDisplayName: "Build: Windows"
1414
agentOs: Windows
1515
buildArgs: -all -pack
1616
artifacts:

.azure/pipelines/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ stages:
574574
jobDisplayName: "Build: Linux Musl ARM"
575575
agentOs: Linux
576576
useHostedUbuntu: false
577-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm-alpine-20210409142425-044d5b9
577+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm-alpine-20211022152824-78f7860
578578
buildArgs:
579579
--arch arm
580580
--os-name linux-musl
@@ -608,7 +608,7 @@ stages:
608608
jobDisplayName: "Build: Linux Musl ARM64"
609609
agentOs: Linux
610610
useHostedUbuntu: false
611-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64-alpine-20210409142425-b2c2436
611+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64-alpine-20211022152824-538077f
612612
buildArgs:
613613
--arch arm64
614614
--os-name linux-musl
@@ -640,7 +640,7 @@ stages:
640640
- template: jobs/default-build.yml
641641
parameters:
642642
jobName: Windows_Test
643-
jobDisplayName: "Test: Windows Server 2016 x64"
643+
jobDisplayName: "Test: Windows Server x64"
644644
agentOs: Windows
645645
isAzDOTestingJob: true
646646
# Just uploading artifacts/logs/ files can take 15 minutes. Doubling the cancel timeout for this job.
@@ -664,7 +664,7 @@ stages:
664664
- template: jobs/default-build.yml
665665
parameters:
666666
jobName: MacOS_Test
667-
jobDisplayName: "Test: macOS 10.15"
667+
jobDisplayName: "Test: macOS"
668668
agentOs: macOS
669669
timeoutInMinutes: 240
670670
isAzDOTestingJob: true
@@ -685,7 +685,7 @@ stages:
685685
- template: jobs/default-build.yml
686686
parameters:
687687
jobName: Linux_Test
688-
jobDisplayName: "Test: Ubuntu 18.04 x64"
688+
jobDisplayName: "Test: Ubuntu x64"
689689
agentOs: Linux
690690
isAzDOTestingJob: true
691691
useHostedUbuntu: false
@@ -739,7 +739,7 @@ stages:
739739
parameters:
740740
platform:
741741
name: 'Managed'
742-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-f39df28-20191023143754'
742+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-20210714125435-9b5bbc2'
743743
buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks'
744744
skipPublishValidation: true
745745

@@ -779,7 +779,7 @@ stages:
779779
- Helix_x64
780780
- Source_Build_Managed
781781
pool:
782-
vmImage: vs2017-win2016
782+
vmImage: windows-latest
783783
publishUsingPipelines: ${{ variables._PublishUsingPipelines }}
784784
enablePublishBuildArtifacts: true # publish artifacts/log files
785785
- ${{ if and(ne(variables['System.TeamProject'], 'public'), or(eq(parameters.testSourceIndexing, 'true'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}:

.azure/pipelines/quarantined-pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ jobs:
113113
- template: jobs/default-build.yml
114114
parameters:
115115
jobName: MacOS_Quarantined_Test
116-
jobDisplayName: "Tests: macOS 10.14"
116+
jobDisplayName: "Tests: macOS"
117117
agentOs: macOS
118118
timeoutInMinutes: 120
119119
isAzDOTestingJob: true
@@ -146,7 +146,7 @@ jobs:
146146
- template: jobs/default-build.yml
147147
parameters:
148148
jobName: Linux_Quarantined_Test
149-
jobDisplayName: "Tests: Ubuntu 18.04 x64"
149+
jobDisplayName: "Tests: Ubuntu x64"
150150
agentOs: Linux
151151
timeoutInMinutes: 60
152152
isAzDOTestingJob: true

docs/Helix.md

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Helix is the distributed test platform that we use to run tests. We build a helix payload that contains the publish directory of every test project that we want to test
44
send a job with with this payload to a set of queues for the various combinations of OS that we want to test
5-
for example: `Windows.10.Amd64.ClientRS4.VS2017.Open`, `OSX.1012.Amd64.Open`, `Ubuntu.1804.Amd64.Open`. Helix takes care of unzipping, running the job, and reporting results.
5+
for example: `Windows.10.Amd64.ClientRS4.VS2017.Open`, `OSX.1100.Amd64.Open`, `Ubuntu.1804.Amd64.Open`. Helix takes care of unzipping, running the job, and reporting results.
66

77
For more info about helix see: [SDK](https://github.com/dotnet/arcade/blob/main/src/Microsoft.DotNet.Helix/Sdk/Readme.md), [JobSender](https://github.com/dotnet/arcade/blob/main/src/Microsoft.DotNet.Helix/Sdk/Readme.md)
88

@@ -19,7 +19,7 @@ This will restore, and then publish all the test project including some bootstra
1919
## Overview of the helix usage in our pipelines
2020

2121
- Required queues: Windows10, OSX, Ubuntu1804
22-
- Full queue matrix: Windows[7, 81, 10], Ubuntu[1804, 2004], Debian9, Redhat7, Arm64 (Win10, Debian9)
22+
- Full queue matrix: Windows[10, 11], Ubuntu[1804, 2004], Debian11, Redhat7, Arm64 (Win10, Debian11)
2323
- The queues are defined in [Helix.Common.props](https://github.com/dotnet/aspnetcore/blob/main/eng/targets/Helix.Common.props)
2424

2525
[aspnetcore-ci](https://dev.azure.com/dnceng/public/_build?definitionId=278) runs non quarantined tests against the required helix queues as a required PR check and all builds on all branches.
@@ -55,31 +55,25 @@ An example of how to get the helix payload to inspect the contents of a test job
5555
There's also a link embedded in the build.cmd log of the Tests: Helix x64 job on Azure Pipelines, near the bottom right that will look something like this:
5656

5757
``` text
58-
Uploading payloads for Job on Ubuntu.1604.Amd64.Open...
59-
Finished uploading payloads for Job on Ubuntu.1604.Amd64.Open...
60-
Sending Job to Ubuntu.1604.Amd64.Open...
61-
Sent Helix Job a5cbf405-1363-452f-af4b-de5b2a61c8cf
62-
Uploading payloads for Job on Windows.10.Amd64.Open...
63-
Finished uploading payloads for Job on Windows.10.Amd64.Open...
64-
Sending Job to Windows.10.Amd64.Open...
65-
Sent Helix Job cbec3697-c298-412a-953a-e375e49d1fe0
66-
Uploading payloads for Job on OSX.1014.Amd64.Open...
67-
Finished uploading payloads for Job on OSX.1014.Amd64.Open...
58+
Sending Job to Ubuntu.1804.Amd64.Open...
59+
Sent Helix Job; see work items at https://helix.dot.net/api/jobs/c1b425c8-0fef-4cba-9dee-29344d7a61b8/workitems?api-version=2019-06-17
60+
Sending Job to Windows.11.Amd64.ClientPre.Open...
61+
Sent Helix Job; see work items at https://helix.dot.net/api/jobs/1fc117ce-d52a-4ea4-8896-3c289fdf8e17/workitems?api-version=2019-06-17
6862
Sending Job to OSX.1014.Amd64.Open...
69-
Sent Helix Job a54359cf-f74d-4d02-9faf-07e0a8380995
70-
Waiting for completion of job cbec3697-c298-412a-953a-e375e49d1fe0
71-
Waiting for completion of job a54359cf-f74d-4d02-9faf-07e0a8380995
72-
Waiting for completion of job a5cbf405-1363-452f-af4b-de5b2a61c8cf
73-
Job a54359cf-f74d-4d02-9faf-07e0a8380995 is completed with 136 finished work items.
74-
Job cbec3697-c298-412a-953a-e375e49d1fe0 is completed with 156 finished work items.
75-
Job a5cbf405-1363-452f-af4b-de5b2a61c8cf is completed with 136 finished work items.
76-
Stopping Azure Pipelines Test Run Ubuntu.1604.Amd64.Open
77-
Stopping Azure Pipelines Test Run Windows.10.Amd64.Open
63+
Sent Helix Job; see work items at https://helix.dot.net/api/jobs/53e2ca23-9efd-4299-8a8f-d9271265aeaa/workitems?api-version=2019-06-17
64+
Waiting for completion of job 1fc117ce-d52a-4ea4-8896-3c289fdf8e17 on Windows.11.Amd64.ClientPre.Open
65+
Waiting for completion of job c1b425c8-0fef-4cba-9dee-29344d7a61b8 on Ubuntu.1804.Amd64.Open
66+
Waiting for completion of job 53e2ca23-9efd-4299-8a8f-d9271265aeaa on OSX.1014.Amd64.Open
67+
Job 53e2ca23-9efd-4299-8a8f-d9271265aeaa on OSX.1014.Amd64.Open is completed with 139 finished work items.
68+
Job c1b425c8-0fef-4cba-9dee-29344d7a61b8 on Ubuntu.1804.Amd64.Open is completed with 138 finished work items.
69+
Job 1fc117ce-d52a-4ea4-8896-3c289fdf8e17 on Windows.11.Amd64.ClientPre.Open is completed with 170 finished work items.
70+
Stopping Azure Pipelines Test Run Ubuntu.1804.Amd64.Open
71+
Stopping Azure Pipelines Test Run Windows.11.Amd64.ClientPre.Open
7872
Stopping Azure Pipelines Test Run OSX.1014.Amd64.Open
79-
F:\workspace\_work\1\s\.packages\microsoft.dotnet.helix.sdk\5.0.0-beta.20280.1\tools\Microsoft.DotNet.Helix.Sdk.MultiQueue.targets(76,5): error : Work item a5cbf405-1363-452f-af4b-de5b2a61c8cf/Microsoft.AspNetCore.Authentication.Test--net5.0 in job a5cbf405-1363-452f-af4b-de5b2a61c8cf has failed. [F:\workspace\_work\1\s\eng\helix\helix.proj]
80-
F:\workspace\_work\1\s\.packages\microsoft.dotnet.helix.sdk\5.0.0-beta.20280.1\tools\Microsoft.DotNet.Helix.Sdk.MultiQueue.targets(76,5): error : Failure log: https://helix.dot.net/api/2019-06-17/jobs/a5cbf405-1363-452f-af4b-de5b2a61c8cf/workitems/Microsoft.AspNetCore.Authentication.Test--net5.0/console [F:\workspace\_work\1\s\eng\helix\helix.proj]
81-
##[error].packages\microsoft.dotnet.helix.sdk\5.0.0-beta.20280.1\tools\Microsoft.DotNet.Helix.Sdk.MultiQueue.targets(76,5): error : (NETCORE_ENGINEERING_TELEMETRY=Test) Work item a5cbf405-1363-452f-af4b-de5b2a61c8cf/Microsoft.AspNetCore.Authentication.Test--net5.0 in job a5cbf405-1363-452f-af4b-de5b2a61c8cf has failed.
82-
Failure log: https://helix.dot.net/api/2019-06-17/jobs/a5cbf405-1363-452f-af4b-de5b2a61c8cf/workitems/Microsoft.AspNetCore.Authentication.Test--net5.0/console
73+
D:\a\_work\1\s\.packages\microsoft.dotnet.helix.sdk\7.0.0-beta.21559.3\tools\Microsoft.DotNet.Helix.Sdk.MultiQueue.targets(78,5): error : Work item Microsoft.AspNetCore.Identity.Test--net7.0 in job 53e2ca23-9efd-4299-8a8f-d9271265aeaa has failed. [D:\a\_work\1\s\eng\helix\helix.proj]
74+
D:\a\_work\1\s\.packages\microsoft.dotnet.helix.sdk\7.0.0-beta.21559.3\tools\Microsoft.DotNet.Helix.Sdk.MultiQueue.targets(78,5): error : Failure log: https://helix.dot.net/api/2019-06-17/jobs/53e2ca23-9efd-4299-8a8f-d9271265aeaa/workitems/Microsoft.AspNetCore.Identity.Test--net7.0/console [D:\a\_work\1\s\eng\helix\helix.proj]
75+
##[error].packages\microsoft.dotnet.helix.sdk\7.0.0-beta.21559.3\tools\Microsoft.DotNet.Helix.Sdk.MultiQueue.targets(78,5): error : (NETCORE_ENGINEERING_TELEMETRY=Test) Work item Microsoft.AspNetCore.Identity.Test--net7.0 in job 53e2ca23-9efd-4299-8a8f-d9271265aeaa has failed.
76+
Failure log: https://helix.dot.net/api/2019-06-17/jobs/53e2ca23-9efd-4299-8a8f-d9271265aeaa/workitems/Microsoft.AspNetCore.Identity.Test--net7.0/console
8377
```
8478

8579
The https://helix.dot.net/ home page displays information about the available public queues (nothing about the related BYOC pools and queues or the internal Helix queues)

eng/scripts/RunHelix.ps1

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,16 @@
88
.PARAMETER HelixQueues
99
Set the Helix queues to use. The list is '+' or ';'-separated.
1010
Some supported queues:
11+
Debian.11.Amd64.Open
12+
Mariner
13+
Redhat.7.Amd64.Open
1114
Ubuntu.1804.Amd64.Open
1215
Ubuntu.2004.Amd64.Open
16+
OSX.1015.Amd64.Open
17+
OSX.1100.Amd64.Open
1318
Windows.10.Amd64.Server20H2.Open
14-
Windows.81.Amd64.Open
15-
Windows.7.Amd64.Open
16-
OSX.1014.Amd64.Open
17-
Debian.9.Amd64.Open
18-
Redhat.7.Amd64.Open
19+
Windows.11.Amd64.ClientPre.Open
20+
Windows.Amd64.Server2022.Open
1921
.PARAMETER RunQuarantinedTests
2022
By default quarantined tests are not run. Set this to $true to run only the quarantined tests.
2123
.PARAMETER TargetArchitecture

eng/targets/Helix.Common.props

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project>
22
<!-- this file is shared between Helix.proj and .csproj files -->
33
<PropertyGroup>
4-
<HelixQueueAlpine312>(Alpine.312.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.12-helix-20200908125345-56c6673</HelixQueueAlpine312>
5-
<HelixQueueDebian11>(Debian.11.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64-20210304164428-5a7c380</HelixQueueDebian11>
6-
<HelixQueueFedora34>(Fedora.34.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix-20210728124700-4f64125</HelixQueueFedora34>
4+
<HelixQueueAlpine314>(Alpine.314.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19</HelixQueueAlpine314>
5+
<HelixQueueDebian11>(Debian.11.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64-20211001171307-0ece9b3</HelixQueueDebian11>
6+
<HelixQueueFedora34>(Fedora.34.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix-20210924174119-4f64125</HelixQueueFedora34>
77
<HelixQueueMariner>(Mariner)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-20210528192219-92bf620</HelixQueueMariner>
8-
<HelixQueueArmDebian9>(Debian.9.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-9-helix-arm64v8-a12566d-20190807161036</HelixQueueArmDebian9>
8+
<HelixQueueArmDebian11>(Debian.11.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm64v8-20211001171229-97d8652</HelixQueueArmDebian11>
99
</PropertyGroup>
10-
10+
1111
<ItemGroup Condition="'$(IsWindowsOnlyTest)' != 'true'">
1212
<HelixAvailablePlatform Include="Windows" />
1313
<HelixAvailablePlatform Include="OSX" />
@@ -22,36 +22,28 @@
2222
<ItemGroup Condition="'$(IsRequiredCheck)' == 'true' AND '$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' != 'true'">
2323
<HelixAvailableTargetQueue Include="Ubuntu.1804.Amd64.Open" Platform="Linux" />
2424
<HelixAvailableTargetQueue Include="Windows.11.Amd64.ClientPre.Open" Platform="Windows" />
25-
<HelixAvailableTargetQueue Include="OSX.1014.Amd64.Open" Platform="OSX" />
26-
</ItemGroup>
27-
28-
<!-- x64 Quarantined-only (quarantined-pr.yml and quarantined-tests.yml) test queues -->
29-
<ItemGroup Condition="'$(IsRequiredCheck)' == 'true' AND '$(TargetArchitecture)' == 'x64' AND '$(_UseHelixOpenQueues)' == 'true' AND '$(RunQuarantinedTests)' == 'true'">
30-
<HelixAvailableTargetQueue Include="$(HelixQueueFedora34)" Platform="Linux" />
25+
<HelixAvailableTargetQueue Include="OSX.1100.Amd64.Open" Platform="OSX" />
3126
</ItemGroup>
3227

3328
<!-- x64 Queues for public helix-matrix.yml and quarantine pipelines, except in windows-only cases -->
3429
<ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true'">
3530
<!-- Linux -->
36-
<HelixAvailableTargetQueue Include="$(HelixQueueDebian11)" Platform="Linux" />
3731
<HelixAvailableTargetQueue Include="Redhat.7.Amd64.Open" Platform="Linux" />
3832
<HelixAvailableTargetQueue Include="Ubuntu.2004.Amd64.Open" Platform="Linux" />
39-
<HelixAvailableTargetQueue Include="Ubuntu.1804.Amd64.Open" Platform="Linux" />
4033

4134
<!-- Mac -->
42-
<HelixAvailableTargetQueue Include="OSX.1014.Amd64.Open" Platform="OSX" />
43-
<HelixAvailableTargetQueue Include="OSX.1100.Amd64.Open" Platform="OSX" />
35+
<HelixAvailableTargetQueue Include="OSX.1015.Amd64.Open" Platform="OSX" />
4436

4537
<!-- Containers -->
38+
<HelixAvailableTargetQueue Include="$(HelixQueueAlpine314)" Platform="Linux" />
39+
<HelixAvailableTargetQueue Include="$(HelixQueueDebian11)" Platform="Linux" />
4640
<HelixAvailableTargetQueue Include="$(HelixQueueFedora34)" Platform="Linux" />
47-
<HelixAvailableTargetQueue Include="$(HelixQueueAlpine312)" Platform="Linux" />
48-
<HelixAvailableTargetQueue Include="$(HelixQueueMariner)" Platform="Linux" />
41+
<HelixAvailableTargetQueue Include="$(HelixQueueMariner)" Platform="Linux" />
4942
</ItemGroup>
5043

5144
<!-- x64 Queues for public helix-matrix.yml and quarantine pipelines, Windows cases-->
5245
<ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true'">
5346
<HelixAvailableTargetQueue Include="Windows.10.Amd64.Server20H2.Open" Platform="Windows" />
54-
<HelixAvailableTargetQueue Include="Windows.11.Amd64.ClientPre.Open" Platform="Windows" />
5547
<HelixAvailableTargetQueue Include="Windows.Amd64.Server2022.Open" Platform="Windows" />
5648
</ItemGroup>
5749

@@ -62,7 +54,7 @@
6254

6355
<!-- arm64 queues for helix-matrix.yml and quarantine pipeline -->
6456
<ItemGroup Condition="'$(TargetArchitecture)' == 'arm64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true'">
65-
<HelixAvailableTargetQueue Include="$(HelixQueueArmDebian9)" Platform="Linux" />
57+
<HelixAvailableTargetQueue Include="$(HelixQueueArmDebian11)" Platform="Linux" />
6658
</ItemGroup>
6759

6860
<!-- IIS Express isn't supported on arm64 and most of the IsWindowsOnlyTests depend on it's setup scripts. -->

eng/targets/Helix.targets

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,12 @@
1010

1111
<PropertyGroup Condition="'$(TestDependsOnPlaywright)' == 'true'">
1212
<SkipHelixQueues>
13-
$(HelixQueueAlpine312);
13+
$(HelixQueueAlpine314);
1414
$(HelixQueueDebian11);
1515
$(HelixQueueFedora34);
1616
$(HelixQueueMariner);
1717
Redhat.7.Amd64.Open;
1818
Ubuntu.2004.Amd64.Open;
19-
Windows.7.Amd64.Open;
20-
Windows.81.Amd64.Open;
2119
</SkipHelixQueues>
2220
<SkipHelixArm>true</SkipHelixArm>
2321
</PropertyGroup>

src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
namespace Microsoft.AspNetCore.Identity.Test;
1919

20+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/38542", Queues="OSX.1015.Amd64.Open;OSX.1015.Amd64")] //slow
2021
public class IdentityUIScriptsTest : IDisposable
2122
{
2223
private readonly ITestOutputHelper _output;

src/ProjectTemplates/test/GrpcTemplateTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public ITestOutputHelper Output
3535
}
3636

3737
[ConditionalFact]
38-
[SkipOnHelix("Not supported queues", Queues = "Windows.7.Amd64;Windows.7.Amd64.Open;Windows.81.Amd64.Open;All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
38+
[SkipOnHelix("Not supported queues", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
3939
[SkipOnAlpine("https://github.com/grpc/grpc/issues/18338")]
4040
public async Task GrpcTemplate()
4141
{

src/Testing/src/xunit/HelixConstants.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ namespace Microsoft.AspNetCore.Testing;
66
public static class HelixConstants
77
{
88
public const string Windows10Arm64 = "Windows.10.Arm64v8.Open;";
9-
public const string DebianArm64 = "Debian.9.Arm64.Open;";
9+
public const string DebianArm64 = "Debian.11.Arm64.Open;";
1010
public const string RedhatAmd64 = "Redhat.7.Amd64.Open;";
1111
}

0 commit comments

Comments
 (0)