gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6876-packages-for-opensuse-15.4' into 'master' 

Add support for OpenSUSE 15.4

Closes #6876

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/6499

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: Andrew Patterson <apatterson@github.com>
This commit is contained in:
Balasankar 'Balu' C 2022-11-24 13:26:31 +00:00
parent c87d70d6a5 29305a2682
commit 8cc8bc20b1
4 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -39,7 +39,7 @@ variables:
# will use images from that registry and not depend on GitLab.com
BUILDER_IMAGE_REGISTRY: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder"
PUBLIC_BUILDER_IMAGE_REGISTRY: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder"
BUILDER_IMAGE_REVISION: "3.14.1"
BUILDER_IMAGE_REVISION: "3.15.0"
# The registry to pull the assets image from
ASSET_REGISTRY: "${CI_REGISTRY}"
ASSET_SYNC_EXISTING_REMOTE_FILES: "keep"

8
gitlab-ci-config/check-packages.yml
View File

@ -173,6 +173,14 @@ OpenSUSE-15.3-arm64-check:
extends: .zypper-install
tags:
- docker-arm-builder
OpenSUSE-15.4-check:
image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.4:${BUILDER_IMAGE_REVISION}"
extends: .zypper-install
OpenSUSE-15.4-arm64-check:
image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.4_arm64:${BUILDER_IMAGE_REVISION}"
extends: .zypper-install
tags:
- docker-arm-builder
SLES-12.5-check:
image: "${DEV_BUILDER_IMAGE_REGISTRY}/sles_12sp5:${BUILDER_IMAGE_REVISION}"
extends:

38
gitlab-ci-config/dev-gitlab-org.yml
View File

@ -329,6 +329,14 @@ OpenSUSE-15.3-arm64-branch:
extends: .branch_template
tags:
- docker-arm-builder
OpenSUSE-15.4-branch:
image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.4:${BUILDER_IMAGE_REVISION}"
extends: .branch_template
OpenSUSE-15.4-arm64-branch:
image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.4_arm64:${BUILDER_IMAGE_REVISION}"
extends: .branch_template
tags:
- docker-arm-builder
AmazonLinux-2-branch:
image: "${BUILDER_IMAGE_REGISTRY}/amazonlinux_2:${BUILDER_IMAGE_REVISION}"
extends: .branch_template
@ -609,6 +617,14 @@ OpenSUSE-15.3-arm64:
extends: .tag_template
tags:
- docker-arm-builder
OpenSUSE-15.4:
image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.4:${BUILDER_IMAGE_REVISION}"
extends: .tag_template
OpenSUSE-15.4-arm64:
image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.4_arm64:${BUILDER_IMAGE_REVISION}"
extends: .tag_template
tags:
- docker-arm-builder
AmazonLinux-2:
image: "${BUILDER_IMAGE_REGISTRY}/amazonlinux_2:${BUILDER_IMAGE_REVISION}"
extends: .tag_template
@ -740,6 +756,20 @@ OpenSUSE-15.3-arm64-staging:
optional: true
- job: OpenSUSE-15.3-arm64-branch
optional: true
OpenSUSE-15.4-staging:
extends: .staging_upload_template
needs:
- job: OpenSUSE-15.4
optional: true
- job: OpenSUSE-15.4-branch
optional: true
OpenSUSE-15.4-arm64-staging:
extends: .staging_upload_template
needs:
- job: OpenSUSE-15.4-arm64
optional: true
- job: OpenSUSE-15.4-arm64-branch
optional: true
AmazonLinux-2-staging:
extends: .staging_upload_template
needs:
@ -860,6 +890,14 @@ OpenSUSE-15.3-arm64-release:
extends: .production_release_template
needs:
- OpenSUSE-15.3-arm64
OpenSUSE-15.4-release:
extends: .production_release_template
needs:
- OpenSUSE-15.4
OpenSUSE-15.4-arm64-release:
extends: .production_release_template
needs:
- OpenSUSE-15.4-arm64
AmazonLinux-2-release:
extends: .production_release_template
needs:

7
gitlab-ci-config/gitlab-com.yml
View File

@ -399,6 +399,7 @@ Centos 8 knapsack: !reference [.knapsack]
Debian 10 knapsack: !reference [.knapsack]
Debian 11 knapsack: !reference [.knapsack]
OpenSUSE 15.3 knapsack: !reference [.knapsack]
OpenSUSE 15.4 knapsack: !reference [.knapsack]
Ubuntu 16.04 knapsack: !reference [.knapsack]
Ubuntu 18.04 knapsack: !reference [.knapsack]
Ubuntu 20.04 knapsack: !reference [.knapsack]
@ -474,6 +475,12 @@ OpenSUSE 15.3 specs :
parallel: 6
needs:
- OpenSUSE 15.3 knapsack
OpenSUSE 15.4 specs :
image: "registry.gitlab.com/gitlab-org/gitlab-build-images:omnibus-gitlab-opensuse15.4"
extends: .chef_spec_template
parallel: 6
needs:
- OpenSUSE 15.4 knapsack
AmazonLinux 2 specs :
image: "registry.gitlab.com/gitlab-org/gitlab-build-images:omnibus-gitlab-amazonlinux2"
extends: .chef_spec_template