Skip to content

Commit 9275bc9

Browse files
authored
[release/7.0] Use new Arm64 Helix queues (#45121)
- clean `cherry-pick` of e609b1c plus touch our YAML - Update `HelixTestRunner` command on Windows - use `dotnet` to avoid x64 requirements when using Win11 ARM64 - also, get scheduled runs going for aspnetcore-helix-matrix - release/6.0 and release/7.0 builds have not run since move to dnceng-public/public nit: Change `$(IsXYZQueue)` properties to ignore case - removes one gotcha going forward
1 parent 3c6fd3e commit 9275bc9

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

.azure/pipelines/helix-matrix.yml

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ schedules:
1313
include:
1414
- release/6.0
1515
- release/7.0
16-
always: false
1716

1817
variables:
1918
- name: _UseHelixOpenQueues

eng/helix/content/runtests.cmd

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ echo.
2424

2525
set exit_code=0
2626

27-
echo "Running tests: %HELIX_CORRELATION_PAYLOAD%/HelixTestRunner/HelixTestRunner.exe --target %$target% --runtime %$aspRuntimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --helixTimeout %$helixTimeout% --playwright %$installPlaywright%"
28-
%HELIX_CORRELATION_PAYLOAD%/HelixTestRunner/HelixTestRunner.exe --target %$target% --runtime %$aspRuntimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --helixTimeout %$helixTimeout% --playwright %$installPlaywright%
27+
echo "Running tests: dotnet %HELIX_CORRELATION_PAYLOAD%/HelixTestRunner/HelixTestRunner.dll --target %$target% --runtime %$aspRuntimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --helixTimeout %$helixTimeout% --playwright %$installPlaywright%"
28+
dotnet %HELIX_CORRELATION_PAYLOAD%/HelixTestRunner/HelixTestRunner.dll --target %$target% --runtime %$aspRuntimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --helixTimeout %$helixTimeout% --playwright %$installPlaywright%
2929
if not errorlevel 0 (
3030
set exit_code=%errorlevel%
3131
)

eng/targets/Helix.Common.props

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<HelixQueueDebian11>(Debian.11.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64</HelixQueueDebian11>
66
<HelixQueueFedora34>(Fedora.34.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-34-helix</HelixQueueFedora34>
77
<HelixQueueMariner>(Mariner)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix</HelixQueueMariner>
8-
<HelixQueueArmDebian11>(Debian.11.Arm64.Open)Ubuntu.1804.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm64v8</HelixQueueArmDebian11>
8+
<HelixQueueArmDebian11>(Debian.11.Arm64.Open)ubuntu.2004.armarch.open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm64v8</HelixQueueArmDebian11>
99

1010
<!-- Do not attempt to override global property. -->
1111
<RunQuarantinedTests Condition=" '$(RunQuarantinedTests)' == '' ">false</RunQuarantinedTests>
@@ -53,7 +53,7 @@
5353
<HelixAvailableTargetQueue Include="Windows.Amd64.Server2022.Open" Platform="Windows" />
5454

5555
<!-- IIS Express isn't supported on arm64 and most of the IsWindowsOnlyTests depend on its setup scripts. -->
56-
<HelixAvailableTargetQueue Include="Windows.10.Arm64v8.Open" Platform="Windows"
56+
<HelixAvailableTargetQueue Include="windows.11.arm64.open" Platform="Windows"
5757
Condition=" '$(IsWindowsOnlyTest)' != 'true' "/>
5858
</ItemGroup>
5959
</Otherwise>
@@ -69,9 +69,9 @@
6969
</When>
7070
<Otherwise>
7171
<PropertyGroup>
72-
<IsArm64HelixQueue>$(HelixTargetQueue.Contains('Arm64'))</IsArm64HelixQueue>
73-
<IsWindowsHelixQueue>$(HelixTargetQueue.Contains('Windows'))</IsWindowsHelixQueue>
74-
<IsMacHelixQueue>$(HelixTargetQueue.Contains('OSX'))</IsMacHelixQueue>
72+
<IsArm64HelixQueue>$(HelixTargetQueue.ToUpperInvariant().Contains('ARM64'))</IsArm64HelixQueue>
73+
<IsWindowsHelixQueue>$(HelixTargetQueue.ToUpperInvariant().Contains('WINDOWS'))</IsWindowsHelixQueue>
74+
<IsMacHelixQueue>$(HelixTargetQueue.ToUpperInvariant().Contains('OSX'))</IsMacHelixQueue>
7575
</PropertyGroup>
7676
</Otherwise>
7777
</Choose>

0 commit comments

Comments
 (0)