# HG changeset patch # User João Alexandre Cunha <j.a.cunha@gmail.com> # Date 1694618602 0 # Wed Sep 13 15:23:22 2023 +0000 # Node ID b40adf6098cacc404fbd58a738ed22ab708b63de # Parent 920f09237fb7f499f89c1537ba94b0d153ec237a Provide packages for OpenSUSE Leap 15.5 Added support for building the OpenSUSE LEAP 15.5 platform. Related to https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8062 Changelog: added diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,7 +42,7 @@ # To be used for images that exist only on dev.gitlab.org DEV_BUILDER_IMAGE_REGISTRY: 'dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder' PUBLIC_BUILDER_IMAGE_REGISTRY: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder" - BUILDER_IMAGE_REVISION: "4.24.0" + BUILDER_IMAGE_REVISION: "4.25.0" # The registry to pull the assets image from ASSET_REGISTRY: "${CI_REGISTRY}" ASSET_SYNC_EXISTING_REMOTE_FILES: "keep" diff --git a/gitlab-ci-config/check-packages.yml b/gitlab-ci-config/check-packages.yml --- a/gitlab-ci-config/check-packages.yml +++ b/gitlab-ci-config/check-packages.yml @@ -202,6 +202,12 @@ OpenSUSE-15.4-arm64-check: image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.4_arm64:${BUILDER_IMAGE_REVISION}" extends: .zypper-arm-install +OpenSUSE-15.5-check: + image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.5:${BUILDER_IMAGE_REVISION}" + extends: .zypper-install +OpenSUSE-15.5-arm64-check: + image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.5_arm64:${BUILDER_IMAGE_REVISION}" + extends: .zypper-arm-install SLES-12.5-check: image: "${DEV_BUILDER_IMAGE_REGISTRY}/sles_12sp5:${BUILDER_IMAGE_REVISION}" extends: diff --git a/gitlab-ci-config/dev-gitlab-org.yml b/gitlab-ci-config/dev-gitlab-org.yml --- a/gitlab-ci-config/dev-gitlab-org.yml +++ b/gitlab-ci-config/dev-gitlab-org.yml @@ -332,6 +332,12 @@ OpenSUSE-15.4-arm64-branch: image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.4_arm64:${BUILDER_IMAGE_REVISION}" extends: .arm64_branch_template +OpenSUSE-15.5-branch: + image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.5:${BUILDER_IMAGE_REVISION}" + extends: .branch_template +OpenSUSE-15.5-arm64-branch: + image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.5_arm64:${BUILDER_IMAGE_REVISION}" + extends: .arm64_branch_template AmazonLinux-2-branch: image: "${BUILDER_IMAGE_REGISTRY}/amazonlinux_2:${BUILDER_IMAGE_REVISION}" extends: .branch_template @@ -612,6 +618,12 @@ OpenSUSE-15.4-arm64: image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.4_arm64:${BUILDER_IMAGE_REVISION}" extends: .arm64_tag_template +OpenSUSE-15.5: + image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.5:${BUILDER_IMAGE_REVISION}" + extends: .tag_template +OpenSUSE-15.5-arm64: + image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.5_arm64:${BUILDER_IMAGE_REVISION}" + extends: .arm64_tag_template AmazonLinux-2: image: "${BUILDER_IMAGE_REGISTRY}/amazonlinux_2:${BUILDER_IMAGE_REVISION}" extends: .tag_template @@ -774,6 +786,20 @@ optional: true - job: OpenSUSE-15.4-arm64-branch optional: true +OpenSUSE-15.5-staging: + extends: .staging_upload_template + needs: + - job: OpenSUSE-15.5 + optional: true + - job: OpenSUSE-15.5-branch + optional: true +OpenSUSE-15.5-arm64-staging: + extends: .staging_upload_template + needs: + - job: OpenSUSE-15.5-arm64 + optional: true + - job: OpenSUSE-15.5-arm64-branch + optional: true AmazonLinux-2-staging: extends: .staging_upload_template needs: @@ -924,6 +950,14 @@ extends: .production_release_template needs: - OpenSUSE-15.4-arm64 +OpenSUSE-15.5-release: + extends: .production_release_template + needs: + - OpenSUSE-15.5 +OpenSUSE-15.5-arm64-release: + extends: .production_release_template + needs: + - OpenSUSE-15.5-arm64 AmazonLinux-2-release: extends: .production_release_template needs: diff --git a/gitlab-ci-config/gitlab-com.yml b/gitlab-ci-config/gitlab-com.yml --- a/gitlab-ci-config/gitlab-com.yml +++ b/gitlab-ci-config/gitlab-com.yml @@ -395,6 +395,7 @@ Debian 11 knapsack: !reference [.knapsack] Debian 12 knapsack: !reference [.knapsack] OpenSUSE 15.4 knapsack: !reference [.knapsack] +OpenSUSE 15.5 knapsack: !reference [.knapsack] Ubuntu 18.04 knapsack: !reference [.knapsack] Ubuntu 20.04 knapsack: !reference [.knapsack] Ubuntu 22.04 knapsack: !reference [.knapsack] @@ -476,6 +477,12 @@ parallel: 6 needs: - OpenSUSE 15.4 knapsack +OpenSUSE 15.5 specs : + image: "${PUBLIC_BUILDER_IMAGE_REGISTRY}/opensuse_15.5-ruby:${BUILDER_IMAGE_REVISION}" + extends: .chef_spec_template + parallel: 6 + needs: + - OpenSUSE 15.5 knapsack AmazonLinux 2 specs : image: "${PUBLIC_BUILDER_IMAGE_REGISTRY}/amazonlinux_2-ruby:${BUILDER_IMAGE_REVISION}" extends: .chef_spec_template