diff --git a/eng/pipeline/data/containers.yml b/eng/pipeline/data/containers.yml index 55cd66438aa..f55c2e045d5 100644 --- a/eng/pipeline/data/containers.yml +++ b/eng/pipeline/data/containers.yml @@ -8,3 +8,5 @@ image: mcr.microsoft.com/microsoft-go/infra-images:cbl-mariner-2.0-arm64-default - container: azurelinux3 image: mcr.microsoft.com/microsoft-go/infra-images:azurelinux-3.0-amd64-default +- container: azurelinux4 + image: mcr.microsoft.com/microsoft-go/infra-images:azurelinux-4.0-amd64-default diff --git a/eng/pipeline/pr-outerloop-pipeline.yml b/eng/pipeline/pr-outerloop-pipeline.yml index ef48796126b..3911a260a70 100644 --- a/eng/pipeline/pr-outerloop-pipeline.yml +++ b/eng/pipeline/pr-outerloop-pipeline.yml @@ -36,6 +36,8 @@ resources: image: mcr.microsoft.com/microsoft-go/infra-images:cbl-mariner-2.0-arm64-default - container: azurelinux3 image: mcr.microsoft.com/microsoft-go/infra-images:azurelinux-3.0-amd64-default + - container: azurelinux4 + image: mcr.microsoft.com/microsoft-go/infra-images:azurelinux-4.0-amd64-default stages: - template: stages/go-builder-matrix-stages.yml parameters: diff --git a/eng/pipeline/pr-pipeline.yml b/eng/pipeline/pr-pipeline.yml index 62da956dd7f..68065aa5bc4 100644 --- a/eng/pipeline/pr-pipeline.yml +++ b/eng/pipeline/pr-pipeline.yml @@ -36,6 +36,8 @@ resources: image: mcr.microsoft.com/microsoft-go/infra-images:cbl-mariner-2.0-arm64-default - container: azurelinux3 image: mcr.microsoft.com/microsoft-go/infra-images:azurelinux-3.0-amd64-default + - container: azurelinux4 + image: mcr.microsoft.com/microsoft-go/infra-images:azurelinux-4.0-amd64-default stages: - template: stages/go-builder-matrix-stages.yml parameters: diff --git a/eng/pipeline/rolling-innerloop-pipeline.yml b/eng/pipeline/rolling-innerloop-pipeline.yml index 5297f593be7..40a6ca57ff6 100644 --- a/eng/pipeline/rolling-innerloop-pipeline.yml +++ b/eng/pipeline/rolling-innerloop-pipeline.yml @@ -58,6 +58,8 @@ extends: image: mcr.microsoft.com/microsoft-go/infra-images:cbl-mariner-2.0-arm64-default azurelinux3: image: mcr.microsoft.com/microsoft-go/infra-images:azurelinux-3.0-amd64-default + azurelinux4: + image: mcr.microsoft.com/microsoft-go/infra-images:azurelinux-4.0-amd64-default stages: - template: stages/go-builder-matrix-stages.yml parameters: diff --git a/eng/pipeline/rolling-pipeline.yml b/eng/pipeline/rolling-pipeline.yml index da7e5ae6767..3c367389f6b 100644 --- a/eng/pipeline/rolling-pipeline.yml +++ b/eng/pipeline/rolling-pipeline.yml @@ -53,6 +53,8 @@ extends: image: mcr.microsoft.com/microsoft-go/infra-images:cbl-mariner-2.0-arm64-default azurelinux3: image: mcr.microsoft.com/microsoft-go/infra-images:azurelinux-3.0-amd64-default + azurelinux4: + image: mcr.microsoft.com/microsoft-go/infra-images:azurelinux-4.0-amd64-default stages: - template: stages/go-builder-matrix-stages.yml parameters: diff --git a/eng/pipeline/stages/go-builder-matrix-stages.yml b/eng/pipeline/stages/go-builder-matrix-stages.yml index 1ec7fca9b95..180d1b702d3 100644 --- a/eng/pipeline/stages/go-builder-matrix-stages.yml +++ b/eng/pipeline/stages/go-builder-matrix-stages.yml @@ -92,6 +92,7 @@ stages: - { nosystemcrypto: true, os: linux, arch: amd64, config: test } - { nosystemcrypto: true, os: linux, arch: amd64, config: test, distro: ubuntu } - { nosystemcrypto: true, os: linux, arch: amd64, config: test, distro: azurelinux3 } + - { nosystemcrypto: true, os: linux, arch: amd64, config: test, distro: azurelinux4 } - { os: linux, arch: amd64, config: test } - { os: linux, arch: amd64, config: test, fips: true } - { os: linux, arch: amd64, config: nocgo, fips: true } @@ -101,6 +102,10 @@ stages: - { os: linux, arch: amd64, config: nocgo, distro: azurelinux3 } - { os: linux, arch: amd64, config: test, distro: azurelinux3, fips: true } - { os: linux, arch: amd64, config: nocgo, distro: azurelinux3, fips: true } + - { os: linux, arch: amd64, config: test, distro: azurelinux4 } + - { os: linux, arch: amd64, config: nocgo, distro: azurelinux4 } + - { os: linux, arch: amd64, config: test, distro: azurelinux4, fips: true } + - { os: linux, arch: amd64, config: nocgo, distro: azurelinux4, fips: true } - { nosystemcrypto: true, os: windows, arch: amd64, config: devscript } - { nosystemcrypto: true, os: windows, arch: amd64, config: test } - { nosystemcrypto: true, os: windows, arch: 386, hostArch: amd64, config: test } diff --git a/eng/pipeline/stages/run-stage.yml b/eng/pipeline/stages/run-stage.yml index 1a7898d24b1..bf66b8b91b1 100644 --- a/eng/pipeline/stages/run-stage.yml +++ b/eng/pipeline/stages/run-stage.yml @@ -76,6 +76,8 @@ stages: container: ubuntu2204 ${{ elseif eq(parameters.builder.distro, 'azurelinux3') }}: container: azurelinux3 + ${{ elseif eq(parameters.builder.distro, 'azurelinux4') }}: + container: azurelinux4 ${{ else }}: container: mariner2 ${{ elseif eq(parameters.builder.hostArch, 'arm64') }}: