Skip to content

Commit ce72326

Browse files
balasankarcRobert Marshall
andcommitted
Merge branch '8398-add-rpi-debian-12-package-build-jobs' into 'master'
Add Debian 12 Raspberry Pi package build jobs Closes #8398 See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7383 Merged-by: Balasankar 'Balu' C <[email protected]> Approved-by: Balasankar 'Balu' C <[email protected]> Co-authored-by: Robert Marshall <[email protected]>
2 parents 346d732 + 65280b6 commit ce72326

File tree

3 files changed

+22
-1
lines changed

3 files changed

+22
-1
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ variables:
4242
# To be used for images that exist only on dev.gitlab.org
4343
DEV_BUILDER_IMAGE_REGISTRY: 'dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder'
4444
PUBLIC_BUILDER_IMAGE_REGISTRY: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder"
45-
BUILDER_IMAGE_REVISION: "5.2.0"
45+
BUILDER_IMAGE_REVISION: "5.4.0"
4646
# The registry to pull the assets image from
4747
ASSET_REGISTRY: "${CI_REGISTRY}"
4848
ASSET_SYNC_EXISTING_REMOTE_FILES: "keep"

gitlab-ci-config/check-packages.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,14 @@ Raspberry-Pi-2-Bullseye-check:
137137
variables:
138138
package_repository: 'raspberry-pi2'
139139
tags: !reference [.distribution-armhf-tags]
140+
Raspberry-Pi-2-Bookworm-check:
141+
image: "${BUILDER_IMAGE_REGISTRY}/rpi_12:${BUILDER_IMAGE_REVISION}"
142+
extends:
143+
- .apt-install
144+
- .ce-tag-only
145+
variables:
146+
package_repository: 'raspberry-pi2'
147+
tags: !reference [.distribution-armhf-tags]
140148
Ubuntu-18.04-fips-check:
141149
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_18.04_fips:${BUILDER_IMAGE_REVISION}"
142150
extends:

gitlab-ci-config/dev-gitlab-org.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,10 @@ Raspberry-Pi-2-Bullseye-branch:
429429
image: "${BUILDER_IMAGE_REGISTRY}/rpi_11:${BUILDER_IMAGE_REVISION}"
430430
extends: .rpi_branch_template
431431

432+
Raspberry-Pi-2-Bookworm-branch:
433+
image: "${BUILDER_IMAGE_REGISTRY}/rpi_12:${BUILDER_IMAGE_REVISION}"
434+
extends: .rpi_branch_template
435+
432436
# This job runs only on nightly EE builds
433437
RAT-Nightly:
434438
stage: slow_jobs
@@ -1102,6 +1106,10 @@ Raspberry-Pi-2-Bullseye:
11021106
extends: .rpi_tag_template
11031107
image: "${BUILDER_IMAGE_REGISTRY}/rpi_11:${BUILDER_IMAGE_REVISION}"
11041108

1109+
Raspberry-Pi-2-Bookworm:
1110+
extends: .rpi_tag_template
1111+
image: "${BUILDER_IMAGE_REGISTRY}/rpi_12:${BUILDER_IMAGE_REVISION}"
1112+
11051113
Raspberry-Pi-2-Buster-release:
11061114
extends: .raspbian_release_template
11071115
needs:
@@ -1112,6 +1120,11 @@ Raspberry-Pi-2-Bullseye-release:
11121120
needs:
11131121
- Raspberry-Pi-2-Bullseye
11141122

1123+
Raspberry-Pi-2-Bookworm-release:
1124+
extends: .raspbian_release_template
1125+
needs:
1126+
- Raspberry-Pi-2-Bookworm
1127+
11151128
AWS-CE-Release:
11161129
variables:
11171130
AWS_LISTING_NAME: "GitLab Community Edition"

0 commit comments

Comments
 (0)