Skip to content

Commit

Permalink
Merge pull request #1370 from microsoft/dev/qmuntalaz3ci
Browse files Browse the repository at this point in the history
Add Azure Linux 3 to CI pipelines
  • Loading branch information
karianna authored Oct 27, 2024
2 parents 9184845 + 3bd1a03 commit 67851da
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 5 deletions.
2 changes: 2 additions & 0 deletions eng/pipeline/pr-outerloop-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ resources:
image: golangpublicimages.azurecr.io/go-infra-images/prereqs:cbl-mariner-1.0.20211027-20211201-0cccc22
- container: mariner1arm64
image: golangpublicimages.azurecr.io/go-infra-images/prereqs:cbl-mariner-arm64-1.0-20220314-a003148
- container: azurelinux3
image: mcr.microsoft.com/microsoft-go/infra-images:azurelinux-3.0-amd64-default-20241024144202-a3a1203

stages:
- template: stages/go-builder-matrix-stages.yml
Expand Down
2 changes: 2 additions & 0 deletions eng/pipeline/pr-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ resources:
image: golangpublicimages.azurecr.io/go-infra-images/prereqs:cbl-mariner-1.0.20211027-20211201-0cccc22
- container: mariner1arm64
image: golangpublicimages.azurecr.io/go-infra-images/prereqs:cbl-mariner-arm64-1.0-20220314-a003148
- container: azurelinux3
image: mcr.microsoft.com/microsoft-go/infra-images:azurelinux-3.0-amd64-default-20241024144202-a3a1203

stages:
- template: stages/go-builder-matrix-stages.yml
Expand Down
2 changes: 2 additions & 0 deletions eng/pipeline/rolling-innerloop-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ extends:
image: golangpublicimages.azurecr.io/go-infra-images/prereqs:cbl-mariner-1.0.20211027-20211201-0cccc22
mariner1arm64:
image: golangpublicimages.azurecr.io/go-infra-images/prereqs:cbl-mariner-arm64-1.0-20220314-a003148
azurelinux3:
image: mcr.microsoft.com/microsoft-go/infra-images:azurelinux-3.0-amd64-default-20241024144202-a3a1203

stages:
- template: stages/go-builder-matrix-stages.yml
Expand Down
2 changes: 2 additions & 0 deletions eng/pipeline/rolling-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ extends:
image: golangpublicimages.azurecr.io/go-infra-images/prereqs:cbl-mariner-1.0.20211027-20211201-0cccc22
mariner1arm64:
image: golangpublicimages.azurecr.io/go-infra-images/prereqs:cbl-mariner-arm64-1.0-20220314-a003148
azurelinux3:
image: mcr.microsoft.com/microsoft-go/infra-images:azurelinux-3.0-amd64-default-20241024144202-a3a1203

stages:
- template: stages/go-builder-matrix-stages.yml
Expand Down
2 changes: 1 addition & 1 deletion eng/pipeline/stages/builders-to-stages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# This template expands a list of builders into a list of jobs.

parameters:
# [] of { id, os, arch, hostarch, config, distro?, experiment? }
# [] of { id, os, arch, hostarch, config, distro?, experiment?, broken? }
builders: []
# If true, include a signing stage+job that depends on all 'buildandpack' builder jobs finishing.
sign: false
Expand Down
2 changes: 2 additions & 0 deletions eng/pipeline/stages/go-builder-matrix-stages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,11 @@ stages:
- { os: linux, arch: amd64, config: devscript }
- { os: linux, arch: amd64, config: test }
- { os: linux, arch: amd64, config: test, distro: ubuntu }
- { os: linux, arch: amd64, config: test, distro: azurelinux3 }
- { experiment: opensslcrypto, os: linux, arch: amd64, config: test }
- { experiment: opensslcrypto, os: linux, arch: amd64, config: test, fips: true }
- { experiment: opensslcrypto, os: linux, arch: amd64, config: test, distro: ubuntu }
- { experiment: opensslcrypto, os: linux, arch: amd64, config: test, distro: azurelinux3, broken: true }
- { experiment: boringcrypto, os: linux, arch: amd64, config: test }
- { experiment: boringcrypto, os: linux, arch: amd64, config: test, distro: ubuntu }
- { os: windows, arch: amd64, config: devscript }
Expand Down
7 changes: 6 additions & 1 deletion eng/pipeline/stages/run-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# This job runs a builder for any OS.

parameters:
# { id, os, arch, hostArch, config, distro?, experiment?, fips? }
# { id, os, arch, hostArch, config, distro?, experiment?, fips?, broken? }
- name: builder
type: object

Expand Down Expand Up @@ -71,6 +71,8 @@ stages:
${{ if eq(parameters.builder.hostArch, 'amd64') }}:
${{ if eq(parameters.builder.distro, 'ubuntu') }}:
container: ubuntu2204
${{ elseif eq(parameters.builder.distro, 'azurelinux3') }}:
container: azurelinux3
${{ else }}:
container: mariner1
${{ elseif eq(parameters.builder.hostArch, 'arm64') }}:
Expand Down Expand Up @@ -278,6 +280,9 @@ stages:
condition: and(ne(variables['TEST_BUILDER_SUCCESSFUL'], 'true'), succeeded())
${{ if ne(attempt, 'FINAL') }}:
ignoreLASTEXITCODE: true
${{ elseif eq(parameters.builder.broken, true) }}:
# Don't fail the job if we are at the last retry and the builder is marked as broken.
continueOnError: true
# - ${{ if eq(parameters.builder.config, 'buildandpack' ) }}:
# - ${{ if ne(parameters.releaseVersion, 'nil') }}:
Expand Down
4 changes: 2 additions & 2 deletions eng/pipeline/stages/shorthand-builders-to-builders.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
# to be used by template expressions, as of writing.

parameters:
# [] of { os, arch, hostArch, config, distro?, experiment? }
# [] of { os, arch, hostArch, config, distro?, experiment?, broken? }
# If hostArch is not defined, defaults to the arch value.
# The job ID is generated based on these values.
shorthandBuilders: []
# The inner jobs template to pass the filed-out builders into.
#
# It should accept parameter "builders", [] of { id, os, arch, hostArch, config, distro?, fips? }
# It should accept parameter "builders", [] of { id, os, arch, hostArch, config, distro?, fips?, broken? }
jobsTemplate: ""
jobsParameters: {}

Expand Down
2 changes: 1 addition & 1 deletion eng/pipeline/stages/sign-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# publishes the signed files and signatures into a consolidated pipeline artifact.

parameters:
# [] of { id, os, arch, config, distro?, experiment? }
# [] of { id, os, arch, config, distro?, experiment?, broken? }
builders: []

stages:
Expand Down

0 comments on commit 67851da

Please sign in to comment.