diff --git a/eng/azure-pipelines-public.yml b/eng/azure-pipelines-public.yml index 1f2c77a7c01..47fde248829 100644 --- a/eng/azure-pipelines-public.yml +++ b/eng/azure-pipelines-public.yml @@ -35,7 +35,7 @@ stages: x64: assetManifestOS: linux assetManifestPlatform: x64 - imagename: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-amd64 + imagename: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-amd64 rootfs: /crossrootfs/x64 ClangTargetArg: /p:ClangTarget=x86_64-linux-gnu ClangBinDirArg: /p:ClangBinDir=/usr/local/bin @@ -43,7 +43,7 @@ stages: arm64: assetManifestOS: linux assetManifestPlatform: arm64 - imagename: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64 + imagename: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-arm64 rootfs: /crossrootfs/arm64 ClangTargetArg: /p:ClangTarget=aarch64-linux-gnu ClangBinDirArg: /p:ClangBinDir=/usr/local/bin @@ -79,7 +79,7 @@ stages: x64: assetManifestOS: linux-musl assetManifestPlatform: x64 - imagename: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-amd64-alpine + imagename: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-amd64-musl rootfs: /crossrootfs/x64 ClangTargetArg: /p:ClangTarget=x86_64-alpine-linux-musl ClangBinDirArg: /p:ClangBinDir=/usr/local/bin @@ -87,7 +87,7 @@ stages: arm64: assetManifestOS: linux-musl assetManifestPlatform: arm64 - imagename: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine + imagename: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-arm64-musl rootfs: /crossrootfs/arm64 ClangTargetArg: /p:ClangTarget=aarch64-alpine-linux-musl ClangBinDirArg: /p:ClangBinDir=/usr/local/bin diff --git a/eng/azure-pipelines.yml b/eng/azure-pipelines.yml index 52d721b1673..ecc1f431740 100644 --- a/eng/azure-pipelines.yml +++ b/eng/azure-pipelines.yml @@ -43,14 +43,14 @@ extends: image: $(WindowsImage) os: windows containers: - mariner2crossamd64: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-amd64 - mariner2crossarm64: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64 - mariner2crossamd64alpine: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-amd64-alpine - mariner2crossarm64alpine: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine + crossamd64: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-amd64 + crossarm64: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-arm64 + crossamd64musl: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-amd64-musl + crossarm64musl: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-arm64-musl stages: - stage: build displayName: Build @@ -77,7 +77,7 @@ extends: name: $(DncEngInternalBuildPool) image: $(LinuxImage) os: linux - container: mariner2crossamd64 + container: crossamd64 steps: - script: | git clean -ffdx @@ -109,7 +109,7 @@ extends: name: $(DncEngInternalBuildPool) image: $(LinuxImage) os: linux - container: mariner2crossarm64 + container: crossarm64 steps: - script: | git clean -ffdx @@ -141,7 +141,7 @@ extends: name: $(DncEngInternalBuildPool) image: $(LinuxImage) os: linux - container: mariner2crossamd64alpine + container: crossamd64musl steps: - script: | git clean -ffdx @@ -173,7 +173,7 @@ extends: name: $(DncEngInternalBuildPool) image: $(LinuxImage) os: linux - container: mariner2crossarm64alpine + container: crossarm64musl steps: - script: | git clean -ffdx