Skip to content

Commit c70bbb3

Browse files
authored
Update VM queues to AL3
1 parent 2540836 commit c70bbb3

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

eng/targets/Helix.Common.props

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<Project>
22
<!-- This file is shared between Helix.proj and .csproj files. -->
33
<PropertyGroup>
4-
<HelixQueueAlmaLinux>(AlmaLinux.9.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:almalinux-9-helix-amd64</HelixQueueAlmaLinux>
5-
<HelixQueueAlpine>(Alpine.321.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.21-helix-amd64</HelixQueueAlpine>
6-
<HelixQueueDebian>(Debian.13.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-13-helix-amd64</HelixQueueDebian>
7-
<HelixQueueFedora>(Fedora.42.Amd64.Open)[email protected]/dotnet-buildtools/fedora-42-helix-amd64</HelixQueueFedora>
8-
<HelixQueueAzureLinux>(AzureLinux.30.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:azurelinux-3.0-helix-amd64</HelixQueueAzureLinux>
4+
<HelixQueueAlmaLinux>(AlmaLinux.9.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:almalinux-9-helix-amd64</HelixQueueAlmaLinux>
5+
<HelixQueueAlpine>(Alpine.321.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.21-helix-amd64</HelixQueueAlpine>
6+
<HelixQueueAzureLinux>(AzureLinux.30.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:azurelinux-3.0-helix-amd64</HelixQueueAzureLinux>
7+
<HelixQueueDebian>(Debian.13.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-13-helix-amd64</HelixQueueDebian>
8+
<HelixQueueFedora>(Fedora.42.Amd64.Open)[email protected]/dotnet-buildtools/fedora-42-helix-amd64</HelixQueueFedora>
9+
<!-- Arm64 -->
910
<HelixQueueArmDebian>(Debian.13.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-13-helix-arm64v8</HelixQueueArmDebian>
1011

1112
<!-- Do not attempt to override global property. -->
@@ -42,9 +43,10 @@
4243

4344
<!-- Containers -->
4445
<HelixAvailableTargetQueue Include="$(HelixQueueAlpine)" Platform="Linux" />
46+
<HelixAvailableTargetQueue Include="$(HelixQueueAzureLinux)" Platform="Linux" />
4547
<HelixAvailableTargetQueue Include="$(HelixQueueDebian)" Platform="Linux" />
4648
<HelixAvailableTargetQueue Include="$(HelixQueueFedora)" Platform="Linux" />
47-
<HelixAvailableTargetQueue Include="$(HelixQueueAzureLinux)" Platform="Linux" />
49+
<!-- Arm64 -->
4850
<HelixAvailableTargetQueue Include="$(HelixQueueArmDebian)" Platform="Linux" />
4951

5052
<!-- Mac -->

eng/targets/Helix.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<SkipHelixQueues>
1919
$(HelixQueueAlmaLinux);
2020
$(HelixQueueAlpine);
21+
$(HelixQueueAzureLinux);
2122
$(HelixQueueDebian);
2223
$(HelixQueueFedora40);
23-
$(HelixQueueMariner);
2424
Ubuntu.2204.Amd64.Open;
2525
</SkipHelixQueues>
2626
<SkipHelixArm>true</SkipHelixArm>

src/ProjectTemplates/test/Templates.Mvc.Tests/Templates.Mvc.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
<!-- Disabling on those OSes until a better fix can be identified -->
2929
<SkipHelixQueues>
3030
$(HelixQueueArmDebian);
31-
$(HelixQueueDebian);
3231
$(HelixQueueAzureLinux);
32+
$(HelixQueueDebian);
3333
$(SkipHelixQueues)
3434
</SkipHelixQueues>
3535
</PropertyGroup>

src/Testing/src/xunit/HelixConstants.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ public static class HelixConstants
88
public const string Windows10Arm64 = "Windows.10.Arm64v8.Open;";
99
public const string DebianAmd64 = "Debian.13.Amd64.Open;";
1010
public const string DebianArm64 = "Debian.13.Arm64.Open;";
11-
public const string AlmaLinuxAmd64 = "(AlmaLinux.9.Amd64.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:almalinux-9-helix-amd64;";
11+
public const string AlmaLinuxAmd64 = "(AlmaLinux.9.Amd64.Open)azurelinux.3[email protected]/dotnet-buildtools/prereqs:almalinux-9-helix-amd64;";
1212
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";
1313
}

0 commit comments

Comments
 (0)