Skip to content

Update helix references #61755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 9, 2025
Merged

Update helix references #61755

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2540836
Update helix references
richlander Apr 30, 2025
c70bbb3
Update VM queues to AL3
richlander May 7, 2025
57da96a
Merge branch 'main' into update-helix-references
richlander May 7, 2025
46ad707
Revert Ubuntu change
richlander May 8, 2025
21f870c
Update eng/targets/Helix.Common.props
richlander May 8, 2025
92639fb
Update registry URL
richlander May 9, 2025
cf9abc3
Merge branch 'main' into update-helix-references
richlander May 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .azure/pipelines/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ extends:
enableInternalSources: true
platform:
name: 'Managed'
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-10-amd64'
buildScript: './eng/build.sh --publish --no-build-repo-tasks $(_PublishArgs) $(_InternalRuntimeDownloadArgs)'
skipPublishValidation: true
jobProperties:
Expand Down
26 changes: 13 additions & 13 deletions eng/targets/Helix.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project>
<!-- This file is shared between Helix.proj and .csproj files. -->
<PropertyGroup>
<HelixQueueAlmaLinux8>(AlmaLinux.8.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:almalinux-8-helix-amd64</HelixQueueAlmaLinux8>
<HelixQueueAlpine318>(Alpine.318.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.18-helix-amd64</HelixQueueAlpine318>
<HelixQueueDebian12>(Debian.12.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-12-helix-amd64</HelixQueueDebian12>
<HelixQueueFedora41>(Fedora.41.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-41-helix</HelixQueueFedora41>
<HelixQueueMariner>(Mariner)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64</HelixQueueMariner>
<HelixQueueArmDebian12>(Debian.12.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-12-helix-arm64v8</HelixQueueArmDebian12>
<HelixQueueAlmaLinux>(AlmaLinux.9.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:almalinux-9-helix-amd64</HelixQueueAlmaLinux>
<HelixQueueAlpine>(Alpine.321.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.21-helix-amd64</HelixQueueAlpine>
<HelixQueueDebian>(Debian.13.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-13-helix-amd64</HelixQueueDebian>
<HelixQueueFedora>(Fedora.42.Amd64.Open)[email protected]/dotnet-buildtools/fedora-42-helix-amd64</HelixQueueFedora>
<HelixQueueAzureLinux>(AzureLinux.30.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:azurelinux-3.0-helix-amd64</HelixQueueAzureLinux>
<HelixQueueArmDebian>(Debian.13.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-13-helix-arm64v8</HelixQueueArmDebian>

<!-- Do not attempt to override global property. -->
<RunQuarantinedTests Condition=" '$(RunQuarantinedTests)' == '' ">false</RunQuarantinedTests>
Expand All @@ -28,7 +28,7 @@
<!-- aspnetcore-ci[-official] (ci.yml) -->
<!-- aspnetcore-quarantined-pr (quarantined-pr.yml) -->
<ItemGroup>
<HelixAvailableTargetQueue Include="Ubuntu.2004.Amd64.Open" Platform="Linux" />
<HelixAvailableTargetQueue Include="Ubuntu.2204.Amd64.Open" Platform="Linux" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see you reverted the Ubuntu2004 -> 2204 change in Helix.targets - did you mean to revert this one as well?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. That one will require some investigation and change. I was wanting to see if we could make a clean PR w/o that change.

<HelixAvailableTargetQueue Include="OSX.15.Amd64.Open" Platform="OSX" />
<HelixAvailableTargetQueue Include="Windows.11.Amd64.Client.Open" Platform="Windows" />
</ItemGroup>
Expand All @@ -38,14 +38,14 @@
<!-- aspnetcore-quarantined-tests (quarantined-tests.yml) and RunHelix.ps1 -RunQuarantinedTests -->
<ItemGroup>
<!-- Linux -->
<HelixAvailableTargetQueue Include="$(HelixQueueAlmaLinux8)" Platform="Linux" />
<HelixAvailableTargetQueue Include="$(HelixQueueAlmaLinux)" Platform="Linux" />

<!-- Containers -->
<HelixAvailableTargetQueue Include="$(HelixQueueAlpine318)" Platform="Linux" />
<HelixAvailableTargetQueue Include="$(HelixQueueDebian12)" Platform="Linux" />
<HelixAvailableTargetQueue Include="$(HelixQueueFedora41)" Platform="Linux" />
<HelixAvailableTargetQueue Include="$(HelixQueueMariner)" Platform="Linux" />
<HelixAvailableTargetQueue Include="$(HelixQueueArmDebian12)" Platform="Linux" />
<HelixAvailableTargetQueue Include="$(HelixQueueAlpine)" Platform="Linux" />
<HelixAvailableTargetQueue Include="$(HelixQueueDebian)" Platform="Linux" />
<HelixAvailableTargetQueue Include="$(HelixQueueFedora)" Platform="Linux" />
<HelixAvailableTargetQueue Include="$(HelixQueueAzureLinux)" Platform="Linux" />
<HelixAvailableTargetQueue Include="$(HelixQueueArmDebian)" Platform="Linux" />

<!-- Mac -->
<HelixAvailableTargetQueue Include="OSX.15.Amd64.Open" Platform="OSX" />
Expand Down
8 changes: 4 additions & 4 deletions eng/targets/Helix.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@

<PropertyGroup Condition="'$(TestDependsOnPlaywright)' == 'true'">
<SkipHelixQueues>
$(HelixQueueAlmaLinux8);
$(HelixQueueAlpine318);
$(HelixQueueDebian12);
$(HelixQueueAlmaLinux);
$(HelixQueueAlpine);
$(HelixQueueDebian);
$(HelixQueueFedora40);
$(HelixQueueMariner);
Ubuntu.2004.Amd64.Open;
Ubuntu.2204.Amd64.Open;
</SkipHelixQueues>
<SkipHelixArm>true</SkipHelixArm>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/ProjectTemplates/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ An entire test project can be configured to skip specific platforms using the `<

```xml
<SkipHelixQueues>
$(HelixQueueArmDebian12);
$(HelixQueueArmDebian);
</SkipHelixQueues>
```

Expand All @@ -109,7 +109,7 @@ When tests are run as part of the CI infrastructure, a number of different timeo

##### Helix job timeout

When queuing test jobs to the Helix infrastructure, a timeout value is passed that the entire Helix job must complete within, i.e. that job running on a single queue. This default value is set in [eng\targets\Helix.props](/eng/targets/Helix.props):
When queuing test jobs to the Helix infrastructure, a timeout value is passed that the entire Helix job must complete within, i.e. that job running on a single queue. This default value is set in [eng\targets\Helix.props](/eng/targets/Helix.props):

```xml
<HelixTimeout>00:45:00</HelixTimeout>
Expand Down
6 changes: 3 additions & 3 deletions src/ProjectTemplates/test/Templates.Mvc.Tests/Templates.Mvc.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
<!-- These tests fail in Helix in Debian and Mariner due to error -901 -->
<!-- Disabling on those OSes until a better fix can be identified -->
<SkipHelixQueues>
$(HelixQueueArmDebian12);
$(HelixQueueDebian12);
$(HelixQueueMariner);
$(HelixQueueArmDebian);
$(HelixQueueDebian);
$(HelixQueueAzureLinux);
$(SkipHelixQueues)
</SkipHelixQueues>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/Testing/src/xunit/HelixConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ namespace Microsoft.AspNetCore.InternalTesting;
public static class HelixConstants
{
public const string Windows10Arm64 = "Windows.10.Arm64v8.Open;";
public const string DebianAmd64 = "Debian.11.Amd64.Open;";
public const string DebianArm64 = "Debian.11.Arm64.Open;";
public const string AlmaLinuxAmd64 = "(AlmaLinux.8.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:almalinux-8-helix-amd64;";
public const string DebianAmd64 = "Debian.13.Amd64.Open;";
public const string DebianArm64 = "Debian.13.Arm64.Open;";
public const string AlmaLinuxAmd64 = "(AlmaLinux.9.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:almalinux-9-helix-amd64;";
public const string NativeAotNotSupportedHelixQueues = "All.OSX;All.Linux;Windows.11.Amd64.Client.Open;Windows.11.Amd64.Client;Windows.Amd64.Server2022.Open;Windows.Amd64.Server2022;windows.11.arm64.open;windows.11.arm64";
}
Loading