diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 955848a9c101..eb37d3d2ec7d 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -669,14 +669,13 @@ extends: path: artifacts/log/ publishOnError: true includeForks: true - # Source build - template: /eng/common/templates-official/job/source-build.yml@self parameters: enableInternalSources: true platform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-10-amd64' buildScript: './eng/build.sh' buildArguments: '--source-build $(_InternalRuntimeDownloadArgs)' jobProperties: diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props index c5628d35c2ff..e517b9410d27 100644 --- a/eng/targets/Helix.Common.props +++ b/eng/targets/Helix.Common.props @@ -1,12 +1,13 @@ - (AlmaLinux.8.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-helix-amd64 - (Alpine.318.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.18-helix-amd64 - (Debian.12.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-amd64 - (Fedora.41.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41-helix - (Mariner)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64 - (Debian.12.Arm64.Open)ubuntu.2204.armarch.open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-arm64v8 + (AlmaLinux.9.Amd64.Open)azurelinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-9-helix-amd64 + (Alpine.321.Amd64.Open)azurelinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.21-helix-amd64 + (AzureLinux.30.Amd64.Open)azurelinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-helix-amd64 + (Debian.13.Amd64.Open)azurelinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-13-helix-amd64 + (Fedora.42.Amd64.Open)azurelinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-42-helix-amd64 + + (Debian.13.Arm64.Open)ubuntu.2204.armarch.open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-13-helix-arm64v8 false @@ -38,14 +39,15 @@ - + - - - - - + + + + + + diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets index 70e01877befa..d58bc8feedde 100644 --- a/eng/targets/Helix.targets +++ b/eng/targets/Helix.targets @@ -16,11 +16,11 @@ - $(HelixQueueAlmaLinux8); - $(HelixQueueAlpine318); - $(HelixQueueDebian12); + $(HelixQueueAlmaLinux); + $(HelixQueueAlpine); + $(HelixQueueAzureLinux); + $(HelixQueueDebian); $(HelixQueueFedora40); - $(HelixQueueMariner); Ubuntu.2004.Amd64.Open; true diff --git a/src/ProjectTemplates/README.md b/src/ProjectTemplates/README.md index 9fb481dee3eb..7d34c1a26a24 100644 --- a/src/ProjectTemplates/README.md +++ b/src/ProjectTemplates/README.md @@ -97,7 +97,7 @@ An entire test project can be configured to skip specific platforms using the `< ```xml - $(HelixQueueArmDebian12); + $(HelixQueueArmDebian); ``` @@ -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 00:45:00 diff --git a/src/ProjectTemplates/test/Templates.Mvc.Tests/Templates.Mvc.Tests.csproj b/src/ProjectTemplates/test/Templates.Mvc.Tests/Templates.Mvc.Tests.csproj index e9371e45210f..e4150c38bcd7 100644 --- a/src/ProjectTemplates/test/Templates.Mvc.Tests/Templates.Mvc.Tests.csproj +++ b/src/ProjectTemplates/test/Templates.Mvc.Tests/Templates.Mvc.Tests.csproj @@ -27,9 +27,9 @@ - $(HelixQueueArmDebian12); - $(HelixQueueDebian12); - $(HelixQueueMariner); + $(HelixQueueArmDebian); + $(HelixQueueAzureLinux); + $(HelixQueueDebian); $(SkipHelixQueues) diff --git a/src/Testing/src/xunit/HelixConstants.cs b/src/Testing/src/xunit/HelixConstants.cs index 47f938e8446f..d47d10bdd026 100644 --- a/src/Testing/src/xunit/HelixConstants.cs +++ b/src/Testing/src/xunit/HelixConstants.cs @@ -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)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/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)azurelinux.3.Amd64.Open@mcr.microsoft.com/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"; }