diff options
| author | Doug Bunting <6431421+dougbu@users.noreply.github.com> | 2022-11-09 02:05:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-09 02:05:20 +0300 |
| commit | e609b1cad60e431ddc0c187e14c537eb4221c1a2 (patch) | |
| tree | 1018dd28f8ba244b06db90ab2cfc5f3249ff553b | |
| parent | ac50803c5a8f7a04621df30846b6f97634966f31 (diff) | |
[main] Use new Arm64 Helix queues (#44868)
- [main] Use new Arm64 Helix queues
nit: Change `$(IsXYZQueue)` properties to ignore case
- removes one gotcha going forward
- Update `HelixTestRunner` command on Windows
- use `dotnet` to avoid x64 requirements when using Win11 ARM64
| -rw-r--r-- | eng/helix/content/runtests.cmd | 4 | ||||
| -rw-r--r-- | eng/targets/Helix.Common.props | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd index ae89869107..8fd9e85596 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 f15b1a336f..46e965c10a 100644 --- a/eng/targets/Helix.Common.props +++ b/eng/targets/Helix.Common.props @@ -5,7 +5,7 @@ <HelixQueueDebian11>(Debian.11.Amd64.Open)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64</HelixQueueDebian11> <HelixQueueFedora34>(Fedora.34.Amd64.Open)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix</HelixQueueFedora34> <HelixQueueMariner>(Mariner)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix</HelixQueueMariner> - <HelixQueueArmDebian11>(Debian.11.Arm64.Open)Ubuntu.1804.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm64v8</HelixQueueArmDebian11> + <HelixQueueArmDebian11>(Debian.11.Arm64.Open)ubuntu.2004.armarch.open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm64v8</HelixQueueArmDebian11> <!-- Do not attempt to override global property. --> <RunQuarantinedTests Condition=" '$(RunQuarantinedTests)' == '' ">false</RunQuarantinedTests> @@ -53,7 +53,7 @@ <HelixAvailableTargetQueue Include="Windows.Amd64.Server2022.Open" Platform="Windows" /> <!-- IIS Express isn't supported on arm64 and most of the IsWindowsOnlyTests depend on its setup scripts. --> - <HelixAvailableTargetQueue Include="Windows.10.Arm64v8.Open" Platform="Windows" + <HelixAvailableTargetQueue Include="windows.11.arm64.open" Platform="Windows" Condition=" '$(IsWindowsOnlyTest)' != 'true' "/> </ItemGroup> </Otherwise> @@ -69,9 +69,9 @@ </When> <Otherwise> <PropertyGroup> - <IsArm64HelixQueue>$(HelixTargetQueue.Contains('Arm64'))</IsArm64HelixQueue> - <IsWindowsHelixQueue>$(HelixTargetQueue.Contains('Windows'))</IsWindowsHelixQueue> - <IsMacHelixQueue>$(HelixTargetQueue.Contains('OSX'))</IsMacHelixQueue> + <IsArm64HelixQueue>$(HelixTargetQueue.ToUpperInvariant().Contains('ARM64'))</IsArm64HelixQueue> + <IsWindowsHelixQueue>$(HelixTargetQueue.ToUpperInvariant().Contains('WINDOWS'))</IsWindowsHelixQueue> + <IsMacHelixQueue>$(HelixTargetQueue.ToUpperInvariant().Contains('OSX'))</IsMacHelixQueue> </PropertyGroup> </Otherwise> </Choose> |