Skip to content

Commit 83483d7

Browse files
authored
[release/6.0] Use new Arm64 Helix queues (#45538)
- unclean `cherry-pick` of e609b1c plus touch our YAML, via #45121 - 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 d9de61f commit 83483d7

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

.azure/pipelines/helix-matrix.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ schedules:
1111
- cron: "0 9 * * *"
1212
branches:
1313
include:
14-
- release/5.0
1514
- release/6.0
16-
always: false
1715

1816
variables:
1917
- ${{ if ne(variables['System.TeamProject'], 'internal') }}:

eng/targets/Helix.Common.props

Lines changed: 4 additions & 4 deletions
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
</PropertyGroup>
1010

1111
<ItemGroup Condition="'$(IsWindowsOnlyTest)' != 'true'">
@@ -58,13 +58,13 @@
5858

5959
<!-- IIS Express isn't supported on arm64 and most of the IsWindowsOnlyTests depend on it's setup scripts. -->
6060
<ItemGroup Condition="'$(TargetArchitecture)' == 'arm64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true'">
61-
<HelixAvailableTargetQueue Include="Windows.10.Arm64v8.Open" Platform="Windows" />
61+
<HelixAvailableTargetQueue Include="windows.11.arm64.open" Platform="Windows" />
6262
</ItemGroup>
6363

6464
<PropertyGroup>
6565
<IsWindowsHelixQueue>false</IsWindowsHelixQueue>
66-
<IsWindowsHelixQueue Condition="$(HelixTargetQueue.Contains('Windows')) or $(HelixTargetQueue.Contains('windows'))">true</IsWindowsHelixQueue>
66+
<IsWindowsHelixQueue Condition="$(HelixTargetQueue.ToUpperInvariant().Contains('WINDOWS'))">true</IsWindowsHelixQueue>
6767
<IsMacHelixQueue>false</IsMacHelixQueue>
68-
<IsMacHelixQueue Condition="$(HelixTargetQueue.Contains('OSX')) or $(HelixTargetQueue.Contains('macOs'))">true</IsMacHelixQueue>
68+
<IsMacHelixQueue Condition="$(HelixTargetQueue.ToUpperInvariant().Contains('OSX'))">true</IsMacHelixQueue>
6969
</PropertyGroup>
7070
</Project>

0 commit comments

Comments
 (0)