Skip to content

Commit a880f24

Browse files
balasankarcAlexand
andcommitted
Merge branch '8062-add-packages-for-opensuse-15-5' into 'master'
Add packages for OpenSUSE 15.5 See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7099 Merged-by: Balasankar 'Balu' C <[email protected]> Approved-by: Andrew Patterson <[email protected]> Approved-by: Balasankar 'Balu' C <[email protected]> Co-authored-by: João Cunha <[email protected]>
2 parents a3c0545 + cd663be commit a880f24

File tree

4 files changed

+48
-1
lines changed

4 files changed

+48
-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: "4.24.0"
45+
BUILDER_IMAGE_REVISION: "4.25.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: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,12 @@ OpenSUSE-15.4-check:
202202
OpenSUSE-15.4-arm64-check:
203203
image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.4_arm64:${BUILDER_IMAGE_REVISION}"
204204
extends: .zypper-arm-install
205+
OpenSUSE-15.5-check:
206+
image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.5:${BUILDER_IMAGE_REVISION}"
207+
extends: .zypper-install
208+
OpenSUSE-15.5-arm64-check:
209+
image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.5_arm64:${BUILDER_IMAGE_REVISION}"
210+
extends: .zypper-arm-install
205211
SLES-12.5-check:
206212
image: "${DEV_BUILDER_IMAGE_REGISTRY}/sles_12sp5:${BUILDER_IMAGE_REVISION}"
207213
extends:

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,12 @@ OpenSUSE-15.4-branch:
328328
OpenSUSE-15.4-arm64-branch:
329329
image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.4_arm64:${BUILDER_IMAGE_REVISION}"
330330
extends: .arm64_branch_template
331+
OpenSUSE-15.5-branch:
332+
image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.5:${BUILDER_IMAGE_REVISION}"
333+
extends: .branch_template
334+
OpenSUSE-15.5-arm64-branch:
335+
image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.5_arm64:${BUILDER_IMAGE_REVISION}"
336+
extends: .arm64_branch_template
331337
AmazonLinux-2-branch:
332338
image: "${BUILDER_IMAGE_REGISTRY}/amazonlinux_2:${BUILDER_IMAGE_REVISION}"
333339
extends: .branch_template
@@ -608,6 +614,12 @@ OpenSUSE-15.4:
608614
OpenSUSE-15.4-arm64:
609615
image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.4_arm64:${BUILDER_IMAGE_REVISION}"
610616
extends: .arm64_tag_template
617+
OpenSUSE-15.5:
618+
image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.5:${BUILDER_IMAGE_REVISION}"
619+
extends: .tag_template
620+
OpenSUSE-15.5-arm64:
621+
image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.5_arm64:${BUILDER_IMAGE_REVISION}"
622+
extends: .arm64_tag_template
611623
AmazonLinux-2:
612624
image: "${BUILDER_IMAGE_REGISTRY}/amazonlinux_2:${BUILDER_IMAGE_REVISION}"
613625
extends: .tag_template
@@ -770,6 +782,20 @@ OpenSUSE-15.4-arm64-staging:
770782
optional: true
771783
- job: OpenSUSE-15.4-arm64-branch
772784
optional: true
785+
OpenSUSE-15.5-staging:
786+
extends: .staging_upload_template
787+
needs:
788+
- job: OpenSUSE-15.5
789+
optional: true
790+
- job: OpenSUSE-15.5-branch
791+
optional: true
792+
OpenSUSE-15.5-arm64-staging:
793+
extends: .staging_upload_template
794+
needs:
795+
- job: OpenSUSE-15.5-arm64
796+
optional: true
797+
- job: OpenSUSE-15.5-arm64-branch
798+
optional: true
773799
AmazonLinux-2-staging:
774800
extends: .staging_upload_template
775801
needs:
@@ -920,6 +946,14 @@ OpenSUSE-15.4-arm64-release:
920946
extends: .production_release_template
921947
needs:
922948
- OpenSUSE-15.4-arm64
949+
OpenSUSE-15.5-release:
950+
extends: .production_release_template
951+
needs:
952+
- OpenSUSE-15.5
953+
OpenSUSE-15.5-arm64-release:
954+
extends: .production_release_template
955+
needs:
956+
- OpenSUSE-15.5-arm64
923957
AmazonLinux-2-release:
924958
extends: .production_release_template
925959
needs:

gitlab-ci-config/gitlab-com.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,7 @@ Debian 10 knapsack: !reference [.knapsack]
409409
Debian 11 knapsack: !reference [.knapsack]
410410
Debian 12 knapsack: !reference [.knapsack]
411411
OpenSUSE 15.4 knapsack: !reference [.knapsack]
412+
OpenSUSE 15.5 knapsack: !reference [.knapsack]
412413
Ubuntu 18.04 knapsack: !reference [.knapsack]
413414
Ubuntu 20.04 knapsack: !reference [.knapsack]
414415
Ubuntu 22.04 knapsack: !reference [.knapsack]
@@ -490,6 +491,12 @@ OpenSUSE 15.4 specs :
490491
parallel: 6
491492
needs:
492493
- OpenSUSE 15.4 knapsack
494+
OpenSUSE 15.5 specs :
495+
image: "${PUBLIC_BUILDER_IMAGE_REGISTRY}/opensuse_15.5-ruby:${BUILDER_IMAGE_REVISION}"
496+
extends: .chef_spec_template
497+
parallel: 6
498+
needs:
499+
- OpenSUSE 15.5 knapsack
493500
AmazonLinux 2 specs :
494501
image: "${PUBLIC_BUILDER_IMAGE_REGISTRY}/amazonlinux_2-ruby:${BUILDER_IMAGE_REVISION}"
495502
extends: .chef_spec_template

0 commit comments

Comments
 (0)