From 9275bc9b3541a01812072a964d1a139e12290158 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Tue, 29 Nov 2022 18:22:11 -0800
Subject: [PATCH] [release/7.0] Use new Arm64 Helix queues (#45121)
- clean `cherry-pick` of e609b1cad60e 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
---
.azure/pipelines/helix-matrix.yml | 1 -
eng/helix/content/runtests.cmd | 4 ++--
eng/targets/Helix.Common.props | 10 +++++-----
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/.azure/pipelines/helix-matrix.yml b/.azure/pipelines/helix-matrix.yml
index c59b65b32b44..55896783ceaa 100644
--- a/.azure/pipelines/helix-matrix.yml
+++ b/.azure/pipelines/helix-matrix.yml
@@ -13,7 +13,6 @@ schedules:
include:
- release/6.0
- release/7.0
- always: false
variables:
- name: _UseHelixOpenQueues
diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd
index ae898691076f..8fd9e85596ce 100644
--- a/eng/helix/content/runtests.cmd
+++ b/eng/helix/content/runtests.cmd
@@ -24,8 +24,8 @@ echo.
set exit_code=0
-echo "Running tests: %HELIX_CORRELATION_PAYLOAD%/HelixTestRunner/HelixTestRunner.exe --target %$target% --runtime %$aspRuntimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --helixTimeout %$helixTimeout% --playwright %$installPlaywright%"
-%HELIX_CORRELATION_PAYLOAD%/HelixTestRunner/HelixTestRunner.exe --target %$target% --runtime %$aspRuntimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --helixTimeout %$helixTimeout% --playwright %$installPlaywright%
+echo "Running tests: dotnet %HELIX_CORRELATION_PAYLOAD%/HelixTestRunner/HelixTestRunner.dll --target %$target% --runtime %$aspRuntimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --helixTimeout %$helixTimeout% --playwright %$installPlaywright%"
+dotnet %HELIX_CORRELATION_PAYLOAD%/HelixTestRunner/HelixTestRunner.dll --target %$target% --runtime %$aspRuntimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --helixTimeout %$helixTimeout% --playwright %$installPlaywright%
if not errorlevel 0 (
set exit_code=%errorlevel%
)
diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props
index f15b1a336f32..46e965c10a2f 100644
--- a/eng/targets/Helix.Common.props
+++ b/eng/targets/Helix.Common.props
@@ -5,7 +5,7 @@
(Debian.11.Amd64.Open)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64
(Fedora.34.Amd64.Open)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix
(Mariner)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix
- (Debian.11.Arm64.Open)Ubuntu.1804.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm64v8
+ (Debian.11.Arm64.Open)ubuntu.2004.armarch.open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm64v8
false
@@ -53,7 +53,7 @@
-
@@ -69,9 +69,9 @@
- $(HelixTargetQueue.Contains('Arm64'))
- $(HelixTargetQueue.Contains('Windows'))
- $(HelixTargetQueue.Contains('OSX'))
+ $(HelixTargetQueue.ToUpperInvariant().Contains('ARM64'))
+ $(HelixTargetQueue.ToUpperInvariant().Contains('WINDOWS'))
+ $(HelixTargetQueue.ToUpperInvariant().Contains('OSX'))