Skip to content

Upgrade Ubuntu and Azure Linux VMs and Containers #61853

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 5 commits into from
Jun 5, 2025
Merged

Upgrade Ubuntu and Azure Linux VMs and Containers #61853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ab0dba3
Upgrade Ubuntu VMs
richlander May 9, 2025
22e7f4c
Merge branch 'main' into upgrade-ubuntu
richlander May 9, 2025
651fbb8
Update eng/targets/Helix.Common.props
richlander May 23, 2025
100658b
Update eng/targets/Helix.targets
richlander May 23, 2025
5df16bd
Update Azure Linux and Ubuntu
richlander Jun 5, 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
9 changes: 6 additions & 3 deletions eng/targets/Helix.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
<!-- This file is shared between Helix.proj and .csproj files. -->
<PropertyGroup>
<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>
<HelixQueueAlpine>(Alpine.322.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-amd64</HelixQueueAlpine>
<HelixQueueAzureLinux>(AzureLinux.30.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:azurelinux-3.0-helix-amd64</HelixQueueAzureLinux>
<HelixQueueDebian>(Debian.13.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-13-helix-amd64</HelixQueueDebian>
<HelixQueueFedora>(Fedora.42.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-42-helix-amd64</HelixQueueFedora>
<HelixQueueUbuntu>(Ubuntu.2404.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-24.04-helix-amd64</HelixQueueUbuntu>
<!-- Arm64 -->
<HelixQueueArmDebian>(Debian.13.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-13-helix-arm64v8</HelixQueueArmDebian>

Expand All @@ -29,7 +30,8 @@
<!-- 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" />
<HelixAvailableTargetQueue Include="AzureLinux.3.Amd64.Open" Platform="Linux" />
<HelixAvailableTargetQueue Include="OSX.15.Amd64.Open" Platform="OSX" />
<HelixAvailableTargetQueue Include="Windows.11.Amd64.Client.Open" Platform="Windows" />
</ItemGroup>
Expand All @@ -43,9 +45,10 @@

<!-- Containers -->
<HelixAvailableTargetQueue Include="$(HelixQueueAlpine)" Platform="Linux" />
<HelixAvailableTargetQueue Include="$(HelixQueueAzureLinux)" Platform="Linux" />
<HelixAvailableTargetQueue Include="$(HelixQueueDebian)" Platform="Linux" />
<HelixAvailableTargetQueue Include="$(HelixQueueAzureLinux)" Platform="Linux" />
<HelixAvailableTargetQueue Include="$(HelixQueueFedora)" Platform="Linux" />
<HelixAvailableTargetQueue Include="$(HelixQueueUbuntu)" Platform="Linux" />
<!-- Arm64 -->
<HelixAvailableTargetQueue Include="$(HelixQueueArmDebian)" Platform="Linux" />

Expand Down
4 changes: 2 additions & 2 deletions eng/targets/Helix.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
<SkipHelixQueues>
$(HelixQueueAlmaLinux);
$(HelixQueueAlpine);
$(HelixQueueAzureLinux);
$(HelixQueueDebian);
$(HelixQueueFedora40);
Ubuntu.2004.Amd64.Open;
$(HelixQueueUbuntu);
AzureLinux.3.Amd64.Open;
</SkipHelixQueues>
<SkipHelixArm>true</SkipHelixArm>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -28,8 +28,8 @@
<!-- Disabling on those OSes until a better fix can be identified -->
<SkipHelixQueues>
$(HelixQueueArmDebian);
$(HelixQueueAzureLinux);
$(HelixQueueDebian);
$(HelixQueueUbuntu);
$(SkipHelixQueues)
</SkipHelixQueues>
</PropertyGroup>
Expand Down
Loading