diff --git a/eng/pipeline/pr-outerloop-pipeline.yml b/eng/pipeline/pr-outerloop-pipeline.yml index 39003c269c..bdd5747e14 100644 --- a/eng/pipeline/pr-outerloop-pipeline.yml +++ b/eng/pipeline/pr-outerloop-pipeline.yml @@ -31,6 +31,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 diff --git a/eng/pipeline/pr-pipeline.yml b/eng/pipeline/pr-pipeline.yml index 8fdc2ed9bb..87c82e4cfb 100644 --- a/eng/pipeline/pr-pipeline.yml +++ b/eng/pipeline/pr-pipeline.yml @@ -28,6 +28,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 diff --git a/eng/pipeline/rolling-innerloop-pipeline.yml b/eng/pipeline/rolling-innerloop-pipeline.yml index 74fc3763de..8830cf9bde 100644 --- a/eng/pipeline/rolling-innerloop-pipeline.yml +++ b/eng/pipeline/rolling-innerloop-pipeline.yml @@ -55,6 +55,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 diff --git a/eng/pipeline/rolling-pipeline.yml b/eng/pipeline/rolling-pipeline.yml index fdb49aeb64..428110bbc4 100644 --- a/eng/pipeline/rolling-pipeline.yml +++ b/eng/pipeline/rolling-pipeline.yml @@ -44,6 +44,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 diff --git a/eng/pipeline/stages/go-builder-matrix-stages.yml b/eng/pipeline/stages/go-builder-matrix-stages.yml index 0ac89f0b44..e9618d4bb8 100644 --- a/eng/pipeline/stages/go-builder-matrix-stages.yml +++ b/eng/pipeline/stages/go-builder-matrix-stages.yml @@ -92,6 +92,7 @@ stages: - { experiment: nosystemcrypto, os: linux, arch: amd64, config: test } - { experiment: nosystemcrypto, os: linux, arch: amd64, config: test, distro: ubuntu } - { experiment: nosystemcrypto, os: linux, arch: amd64, config: test, distro: azurelinux3 } + - { experiment: nosystemcrypto, os: linux, arch: amd64, config: test, distro: azurelinux4 } - { experiment: systemcrypto, os: linux, arch: amd64, config: test } - { experiment: systemcrypto, os: linux, arch: amd64, config: test, fips: true } - { experiment: 'systemcrypto,ms_nocgo_opensslcrypto', os: linux, arch: amd64, config: nocgo, fips: true } @@ -101,6 +102,10 @@ stages: - { experiment: 'systemcrypto,ms_nocgo_opensslcrypto', os: linux, arch: amd64, config: nocgo, distro: azurelinux3 } - { experiment: systemcrypto, os: linux, arch: amd64, config: test, distro: azurelinux3, fips: true } - { experiment: 'systemcrypto,ms_nocgo_opensslcrypto', os: linux, arch: amd64, config: nocgo, distro: azurelinux3, fips: true } + - { experiment: systemcrypto, os: linux, arch: amd64, config: test, distro: azurelinux4 } + - { experiment: 'systemcrypto,ms_nocgo_opensslcrypto', os: linux, arch: amd64, config: nocgo, distro: azurelinux4 } + - { experiment: systemcrypto, os: linux, arch: amd64, config: test, distro: azurelinux4, fips: true } + - { experiment: 'systemcrypto,ms_nocgo_opensslcrypto', os: linux, arch: amd64, config: nocgo, distro: azurelinux4, fips: true } - { experiment: nosystemcrypto, os: windows, arch: amd64, config: devscript } - { experiment: nosystemcrypto, os: windows, arch: amd64, config: test } - { experiment: systemcrypto, os: windows, arch: amd64, config: test } diff --git a/eng/pipeline/stages/run-stage.yml b/eng/pipeline/stages/run-stage.yml index a5d3c9c20d..14823186a6 100644 --- a/eng/pipeline/stages/run-stage.yml +++ b/eng/pipeline/stages/run-stage.yml @@ -71,6 +71,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') }}: