From d3c52385c8019833d0a1143efad477eb5f98c299 Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Tue, 15 Jul 2025 16:45:58 +0000 Subject: [PATCH 01/43] Update component version files --- GITALY_SERVER_VERSION | 2 +- GITLAB_ELASTICSEARCH_INDEXER_VERSION | 2 +- GITLAB_KAS_VERSION | 2 +- GITLAB_PAGES_VERSION | 2 +- GITLAB_SHELL_VERSION | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 1f7391f92b..26ae9afe70 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -master +8f9c2110ff6e901e2e49a3a68664e450665d48a9 \ No newline at end of file diff --git a/GITLAB_ELASTICSEARCH_INDEXER_VERSION b/GITLAB_ELASTICSEARCH_INDEXER_VERSION index ba2906d066..3b867ccd76 100644 --- a/GITLAB_ELASTICSEARCH_INDEXER_VERSION +++ b/GITLAB_ELASTICSEARCH_INDEXER_VERSION @@ -1 +1 @@ -main +5.7.0 \ No newline at end of file diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION index 1f7391f92b..061135ae5c 100644 --- a/GITLAB_KAS_VERSION +++ b/GITLAB_KAS_VERSION @@ -1 +1 @@ -master +886a296a3cc0e2c8e1d401c1ef33dfc214148542 \ No newline at end of file diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION index 1f7391f92b..57f3a2e981 100644 --- a/GITLAB_PAGES_VERSION +++ b/GITLAB_PAGES_VERSION @@ -1 +1 @@ -master +75a6f80c1fbed1cd292cca2e532f4a905e3569d8 \ No newline at end of file diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION index ba2906d066..6ae2739c66 100644 --- a/GITLAB_SHELL_VERSION +++ b/GITLAB_SHELL_VERSION @@ -1 +1 @@ -main +14.43.0 \ No newline at end of file From e6c1894793e8b0de0244546b6fd14611eacdb3c7 Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Tue, 15 Jul 2025 16:46:03 +0000 Subject: [PATCH 02/43] Set QA test targets for 18.2.0+rc42.ee.0 [ci skip] --- gitlab-ci-config/variables.yml | 84 +++++++++++++++------------------- 1 file changed, 37 insertions(+), 47 deletions(-) diff --git a/gitlab-ci-config/variables.yml b/gitlab-ci-config/variables.yml index 3b7dc7021b..2e7948fe7d 100644 --- a/gitlab-ci-config/variables.yml +++ b/gitlab-ci-config/variables.yml @@ -1,59 +1,49 @@ --- variables: - # BUILDER_IMAGE_REGISTRY is set to - # `dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder` in the project - # settings of omnibus-gitlab mirror in dev.gitlab.org so that builds there - # will use images from that registry and not depend on GitLab.com - BUILDER_IMAGE_REGISTRY: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder" - # 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: "5.34.0" - # The registry to pull the assets image from + BUILDER_IMAGE_REGISTRY: registry.gitlab.com/gitlab-org/gitlab-omnibus-builder + 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: 5.34.0 ASSET_REGISTRY: "${CI_REGISTRY}" - ASSET_SYNC_EXISTING_REMOTE_FILES: "keep" - ASSET_SYNC_GZIP_COMPRESSION: "true" - ASSET_PATH: "assets-${CI_COMMIT_REF_SLUG}" - COMPILE_ASSETS: "false" - BUNDLE_PATH__SYSTEM: "false" - # CI images - DOCKERHUB_PREFIX: "docker.io" # Set to dependency proxy if rate limits become a problem. + ASSET_SYNC_EXISTING_REMOTE_FILES: keep + ASSET_SYNC_GZIP_COMPRESSION: 'true' + ASSET_PATH: assets-${CI_COMMIT_REF_SLUG} + COMPILE_ASSETS: 'false' + BUNDLE_PATH__SYSTEM: 'false' + DOCKERHUB_PREFIX: docker.io RUBY_IMAGE: "${DOCKERHUB_PREFIX}/ruby:3.2" RUBY_ALPINE_IMAGE: "${RUBY_IMAGE}-alpine" BASH_IMAGE: "${DOCKERHUB_PREFIX}/bash:5.2-alpine3.20" ALPINE_IMAGE: "${DOCKERHUB_PREFIX}/alpine:3.21" UBUNTU_IMAGE: "${DOCKERHUB_PREFIX}/ubuntu:24.04" DOCKER_DIND_IMAGE: "${DOCKERHUB_PREFIX}/docker:28.0.4-dind" - DEPENDENCY_PROXY_LOGIN: "false" - # Format of the auto-deploy tag for auto-deploy builds. - # https://gitlab.com/gitlab-org/release/docs/blob/master/general/deploy/auto-deploy.md#auto-deploy-tagging - AUTO_DEPLOY_TAG_REGEX: '^\d+\.\d+\.\d+\+[^ ]{7,}\.[^ ]{7,}$' - # Default environment for auto-deploy - AUTO_DEPLOY_ENVIRONMENT: 'pre' - OMNIBUS_GITLAB_MIRROR_ID: "14588374" - DOCS_GITLAB_REPO_SUFFIX: "omnibus" + DEPENDENCY_PROXY_LOGIN: 'false' + AUTO_DEPLOY_TAG_REGEX: "^\\d+\\.\\d+\\.\\d+\\+[^ ]{7,}\\.[^ ]{7,}$" + AUTO_DEPLOY_ENVIRONMENT: pre + OMNIBUS_GITLAB_MIRROR_ID: '14588374' + DOCS_GITLAB_REPO_SUFFIX: omnibus DOCS_LINT_IMAGE: registry.gitlab.com/gitlab-org/technical-writing/docs-gitlab-com/lint-markdown:alpine-3.21-vale-3.11.2-markdownlint2-0.17.2-lychee-0.18.1 - CACHE_KEY_SUFFIX: '-v3' - CACHE_EDITION: "CE" - CACHE_POLICY: 'pull-push' - ISSUE_BOT_LABELS_EXTRA: "group::distribution" - BUNDLER_VERSION: "2.6.9" - GET_GEO_TAG: "0.7.4" - GITLAB_NAMESPACE: "gitlab-org" - CANONICAL_PROJECT_PATH: 'gitlab-org/omnibus-gitlab' - SECURITY_PROJECT_PATH: 'gitlab-org/security/omnibus-gitlab' - DEV_PROJECT_PATH: 'gitlab/omnibus-gitlab' - QA_PROJECT_PATH: 'gitlab-org/build/omnibus-gitlab-mirror' - ARM64_RUNNER_TAG: 'arm64' - PACKAGE_PROMOTION_RUNNER_TAG: 'promotion' - NIGHTLY_REPO: 'nightly-builds' - NIGHTLY_FIPS_REPO: 'nightly-fips-builds' - QA_TESTS_UPSTREAM_PROJECT: 'gitlab-org/gitlab' - QA_TESTS_REF: 'master' - OPENSSL_VERSION: '3.4.1' + CACHE_KEY_SUFFIX: "-v3" + CACHE_EDITION: CE + CACHE_POLICY: pull-push + ISSUE_BOT_LABELS_EXTRA: group::distribution + BUNDLER_VERSION: 2.6.9 + GET_GEO_TAG: 0.7.4 + GITLAB_NAMESPACE: gitlab-org + CANONICAL_PROJECT_PATH: gitlab-org/omnibus-gitlab + SECURITY_PROJECT_PATH: gitlab-org/security/omnibus-gitlab + DEV_PROJECT_PATH: gitlab/omnibus-gitlab + QA_PROJECT_PATH: gitlab-org/build/omnibus-gitlab-mirror + ARM64_RUNNER_TAG: arm64 + PACKAGE_PROMOTION_RUNNER_TAG: promotion + NIGHTLY_REPO: nightly-builds + NIGHTLY_FIPS_REPO: nightly-fips-builds + QA_TESTS_UPSTREAM_PROJECT: gitlab-org/gitlab-foss + QA_TESTS_REF: 18-2-stable + OPENSSL_VERSION: 3.4.1 FF_TIMESTAMPS: true - OPENSSL_GEM_VERSION: '~> 3.2.0' - RAT_PROJECT_PATH: 'gitlab-org/distribution/reference-architecture-tester' + OPENSSL_GEM_VERSION: "~> 3.2.0" + RAT_PROJECT_PATH: gitlab-org/distribution/reference-architecture-tester DISABLE_RPI_BUILDS: 'true' - PUBLIC_IMAGE_ARCHIVE_REGISTRY: 'registry.gitlab.com' - PUBLIC_IMAGE_ARCHIVE_REGISTRY_PATH: 'gitlab-org/public-image-archive' + PUBLIC_IMAGE_ARCHIVE_REGISTRY: registry.gitlab.com + PUBLIC_IMAGE_ARCHIVE_REGISTRY_PATH: gitlab-org/public-image-archive From 2e5242e9f5da35da35c6c0b11b192bf6b2921623 Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Tue, 15 Jul 2025 16:46:05 +0000 Subject: [PATCH 03/43] Update VERSION to 18.2.0-rc42 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 1f7391f92b..3f0a968853 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -master +18.2.0-rc42 \ No newline at end of file From d1c716f580e156bc3da0775c34f3ccd3b80dcc3d Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Tue, 15 Jul 2025 16:46:10 +0000 Subject: [PATCH 04/43] Set QA test targets for 18.2.0+rc42.ee.0 [ci skip] --- gitlab-ci-config/variables.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab-ci-config/variables.yml b/gitlab-ci-config/variables.yml index 2e7948fe7d..da226015a0 100644 --- a/gitlab-ci-config/variables.yml +++ b/gitlab-ci-config/variables.yml @@ -38,8 +38,8 @@ variables: PACKAGE_PROMOTION_RUNNER_TAG: promotion NIGHTLY_REPO: nightly-builds NIGHTLY_FIPS_REPO: nightly-fips-builds - QA_TESTS_UPSTREAM_PROJECT: gitlab-org/gitlab-foss - QA_TESTS_REF: 18-2-stable + QA_TESTS_UPSTREAM_PROJECT: gitlab-org/gitlab + QA_TESTS_REF: 18-2-stable-ee OPENSSL_VERSION: 3.4.1 FF_TIMESTAMPS: true OPENSSL_GEM_VERSION: "~> 3.2.0" From 6ed3e889c9fbbc7d6d693ed4af534eda7f41b1cb Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Tue, 15 Jul 2025 16:46:13 +0000 Subject: [PATCH 05/43] Update VERSION to 18.2.0-rc42-ee --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 3f0a968853..aa552628ce 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.2.0-rc42 \ No newline at end of file +18.2.0-rc42-ee \ No newline at end of file From 0d9a348dfc0f55375d876c98fc1aad6c3aab1769 Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Tue, 15 Jul 2025 20:47:56 +0000 Subject: [PATCH 06/43] Set QA test targets for 18.2.0+rc43.ee.0 [ci skip] --- gitlab-ci-config/variables.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab-ci-config/variables.yml b/gitlab-ci-config/variables.yml index da226015a0..2e7948fe7d 100644 --- a/gitlab-ci-config/variables.yml +++ b/gitlab-ci-config/variables.yml @@ -38,8 +38,8 @@ variables: PACKAGE_PROMOTION_RUNNER_TAG: promotion NIGHTLY_REPO: nightly-builds NIGHTLY_FIPS_REPO: nightly-fips-builds - QA_TESTS_UPSTREAM_PROJECT: gitlab-org/gitlab - QA_TESTS_REF: 18-2-stable-ee + QA_TESTS_UPSTREAM_PROJECT: gitlab-org/gitlab-foss + QA_TESTS_REF: 18-2-stable OPENSSL_VERSION: 3.4.1 FF_TIMESTAMPS: true OPENSSL_GEM_VERSION: "~> 3.2.0" From 45c3f6ac4513fa3115ee53987751ee5a358e131f Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Tue, 15 Jul 2025 20:47:58 +0000 Subject: [PATCH 07/43] Update VERSION to 18.2.0-rc43 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index aa552628ce..ef8f4cc5e1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.2.0-rc42-ee \ No newline at end of file +18.2.0-rc43 \ No newline at end of file From d640a7bf9dfb0eb56f4721ac87b210587f0eb535 Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Tue, 15 Jul 2025 20:48:03 +0000 Subject: [PATCH 08/43] Set QA test targets for 18.2.0+rc43.ee.0 [ci skip] --- gitlab-ci-config/variables.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab-ci-config/variables.yml b/gitlab-ci-config/variables.yml index 2e7948fe7d..da226015a0 100644 --- a/gitlab-ci-config/variables.yml +++ b/gitlab-ci-config/variables.yml @@ -38,8 +38,8 @@ variables: PACKAGE_PROMOTION_RUNNER_TAG: promotion NIGHTLY_REPO: nightly-builds NIGHTLY_FIPS_REPO: nightly-fips-builds - QA_TESTS_UPSTREAM_PROJECT: gitlab-org/gitlab-foss - QA_TESTS_REF: 18-2-stable + QA_TESTS_UPSTREAM_PROJECT: gitlab-org/gitlab + QA_TESTS_REF: 18-2-stable-ee OPENSSL_VERSION: 3.4.1 FF_TIMESTAMPS: true OPENSSL_GEM_VERSION: "~> 3.2.0" From 7179d3a38febd089731b105bc0f17bf9bcf3fc68 Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Tue, 15 Jul 2025 20:48:05 +0000 Subject: [PATCH 09/43] Update VERSION to 18.2.0-rc43-ee --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index ef8f4cc5e1..ec6793da91 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.2.0-rc43 \ No newline at end of file +18.2.0-rc43-ee \ No newline at end of file From 1f9b5be0004d21a0eac1f5726be4abe2ab6bc8da Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Wed, 16 Jul 2025 11:42:18 +0000 Subject: [PATCH 10/43] Update changelog for 18.2.0 [ci skip] --- CHANGELOG.md | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 243f6fe57c..d6b26b8457 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,39 @@ The latest version of this file can be found at the master branch of the omnibus-gitlab repository. +## 18.2.0 (2025-07-16) + +### Added (1 change) + +- [Preinstall: Optionally skip config check](gitlab-org/omnibus-gitlab@b5ba64498620a8c1017b8468e80e2537c3561ba1) ([merge request](gitlab-org/omnibus-gitlab!8470)) + +### Fixed (2 changes) + +- [Remove X-Content-Type-Options header for assets](gitlab-org/omnibus-gitlab@959185aa2008aeec2d864d02f180897e22886b8b) ([merge request](gitlab-org/omnibus-gitlab!8537)) +- [Change SIGTERM behaviour for PgBouncer](gitlab-org/omnibus-gitlab@96d6b822e077935d5f50224396cb9213de39bc93) ([merge request](gitlab-org/omnibus-gitlab!8511)) + +### Changed (11 changes) + +- [Bump Mattermost to version 10.9.1](gitlab-org/omnibus-gitlab@31dfc5be91fd4ff49740bbced37d3db5c04a3fd4) by @christian.hueser.hzdr ([merge request](gitlab-org/omnibus-gitlab!8517)) +- [Update dependency gitlab-exporter to v15.6.0](gitlab-org/omnibus-gitlab@47a59243762e08c57a902728c222ba9842a4125f) ([merge request](gitlab-org/omnibus-gitlab!8550)) +- [Update dependency container-registry to v4.24.0-gitlab](gitlab-org/omnibus-gitlab@2843fa1c1a075cf43572e2a2d530f2ceaeb1d735) ([merge request](gitlab-org/omnibus-gitlab!8542)) +- [Update dependency bundler to v2.6.9](gitlab-org/omnibus-gitlab@20a775e0a6982d0ac94976eb32a33104856f4ae0) ([merge request](gitlab-org/omnibus-gitlab!8456)) +- [Update dependency curl to 8.14.1](gitlab-org/omnibus-gitlab@9c437e166947f4effbb4c5cecce27a177a83fe69) ([merge request](gitlab-org/omnibus-gitlab!8497)) +- [Use `openssl rehash` instead of `c_rehash`](gitlab-org/omnibus-gitlab@82ff0c22abc337336c161b815b701d4515bd56f7) ([merge request](gitlab-org/omnibus-gitlab!8306)) +- [Update dependency gitlab-exporter to v15.5.0](gitlab-org/omnibus-gitlab@e0a3573cc852c11df6859a30025b6eed27196b38) ([merge request](gitlab-org/omnibus-gitlab!8514)) +- [Update dependency container-registry to v4.23.2-gitlab](gitlab-org/omnibus-gitlab@ff62051a1008c080ce12d2af078b67c342d2c754) ([merge request](gitlab-org/omnibus-gitlab!8512)) +- [Bump libxml2 to 2.14.4](gitlab-org/omnibus-gitlab@f4295a656944436ca167dcdeb73e205d24b4a6a7) ([merge request](gitlab-org/omnibus-gitlab!8362)) +- [Bump libarchive to 3.8.1](gitlab-org/omnibus-gitlab@11a980bf1c4b6fc3e4d038ce2ce5d16e189b0c87) ([merge request](gitlab-org/omnibus-gitlab!8430)) +- [Update dependency pgbouncer_exporter to v0.11.0](gitlab-org/omnibus-gitlab@a1c3af7a9d0b8e07439f62b9ba72716bf2fc891e) ([merge request](gitlab-org/omnibus-gitlab!8482)) + +### Removed (1 change) + +- [Stop building for SLES 15.2](gitlab-org/omnibus-gitlab@33b035b6f648e90f103ca25363835f6d71abab88) ([merge request](gitlab-org/omnibus-gitlab!8524)) + +### Security (1 change) + +- [Update rsync from 3.2.7 to 3.4.1](gitlab-org/omnibus-gitlab@5deb671cb00cef4a22f0abd0000e2657658ecd4c) + ## 18.1.2 (2025-07-09) ### Security (1 change) From ff03ab59700672b32f16c30acbeb3adfc97e2a03 Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Wed, 16 Jul 2025 11:42:29 +0000 Subject: [PATCH 11/43] Update component version files --- GITALY_SERVER_VERSION | 2 +- GITLAB_KAS_VERSION | 2 +- GITLAB_PAGES_VERSION | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 26ae9afe70..585739b67d 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -8f9c2110ff6e901e2e49a3a68664e450665d48a9 \ No newline at end of file +18.2.0 \ No newline at end of file diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION index 061135ae5c..585739b67d 100644 --- a/GITLAB_KAS_VERSION +++ b/GITLAB_KAS_VERSION @@ -1 +1 @@ -886a296a3cc0e2c8e1d401c1ef33dfc214148542 \ No newline at end of file +18.2.0 \ No newline at end of file diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION index 57f3a2e981..585739b67d 100644 --- a/GITLAB_PAGES_VERSION +++ b/GITLAB_PAGES_VERSION @@ -1 +1 @@ -75a6f80c1fbed1cd292cca2e532f4a905e3569d8 \ No newline at end of file +18.2.0 \ No newline at end of file From d918bcee6e27166baee679c3533a0bb8d413d535 Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Wed, 16 Jul 2025 11:42:35 +0000 Subject: [PATCH 12/43] Set QA test targets for 18.2.0+ee.0 [ci skip] --- gitlab-ci-config/variables.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab-ci-config/variables.yml b/gitlab-ci-config/variables.yml index da226015a0..2e7948fe7d 100644 --- a/gitlab-ci-config/variables.yml +++ b/gitlab-ci-config/variables.yml @@ -38,8 +38,8 @@ variables: PACKAGE_PROMOTION_RUNNER_TAG: promotion NIGHTLY_REPO: nightly-builds NIGHTLY_FIPS_REPO: nightly-fips-builds - QA_TESTS_UPSTREAM_PROJECT: gitlab-org/gitlab - QA_TESTS_REF: 18-2-stable-ee + QA_TESTS_UPSTREAM_PROJECT: gitlab-org/gitlab-foss + QA_TESTS_REF: 18-2-stable OPENSSL_VERSION: 3.4.1 FF_TIMESTAMPS: true OPENSSL_GEM_VERSION: "~> 3.2.0" From b48217c2b492baff97535e66c84e9b7c1a55d300 Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Wed, 16 Jul 2025 11:42:37 +0000 Subject: [PATCH 13/43] Update VERSION to 18.2.0 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index ec6793da91..585739b67d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.2.0-rc43-ee \ No newline at end of file +18.2.0 \ No newline at end of file From 39453d5a125a0f40570c2bd4ef2bc1528d961b27 Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Wed, 16 Jul 2025 11:42:42 +0000 Subject: [PATCH 14/43] Set QA test targets for 18.2.0+ee.0 [ci skip] --- gitlab-ci-config/variables.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab-ci-config/variables.yml b/gitlab-ci-config/variables.yml index 2e7948fe7d..da226015a0 100644 --- a/gitlab-ci-config/variables.yml +++ b/gitlab-ci-config/variables.yml @@ -38,8 +38,8 @@ variables: PACKAGE_PROMOTION_RUNNER_TAG: promotion NIGHTLY_REPO: nightly-builds NIGHTLY_FIPS_REPO: nightly-fips-builds - QA_TESTS_UPSTREAM_PROJECT: gitlab-org/gitlab-foss - QA_TESTS_REF: 18-2-stable + QA_TESTS_UPSTREAM_PROJECT: gitlab-org/gitlab + QA_TESTS_REF: 18-2-stable-ee OPENSSL_VERSION: 3.4.1 FF_TIMESTAMPS: true OPENSSL_GEM_VERSION: "~> 3.2.0" From 873147e08e089adbdd4b6386f0cf4938897e9764 Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Wed, 16 Jul 2025 11:42:45 +0000 Subject: [PATCH 15/43] Update VERSION to 18.2.0-ee --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 585739b67d..0cd660a0d7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.2.0 \ No newline at end of file +18.2.0-ee \ No newline at end of file From 7333529c9c742fa86c02a0a41092c1624890100c Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Tue, 22 Jul 2025 11:46:55 +0000 Subject: [PATCH 16/43] Update changelog for 18.2.1 [ci skip] --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6b26b8457..1aafc2ac4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ The latest version of this file can be found at the master branch of the omnibus-gitlab repository. +## 18.2.1 (2025-07-22) + +No changes. + ## 18.2.0 (2025-07-16) ### Added (1 change) From 1a7af70b32fa84f4402942dbb0b76bd955e296b5 Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Tue, 22 Jul 2025 11:47:10 +0000 Subject: [PATCH 17/43] Update component version files --- GITALY_SERVER_VERSION | 2 +- GITLAB_KAS_VERSION | 2 +- GITLAB_PAGES_VERSION | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 585739b67d..745b490654 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -18.2.0 \ No newline at end of file +18.2.1 \ No newline at end of file diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION index 585739b67d..745b490654 100644 --- a/GITLAB_KAS_VERSION +++ b/GITLAB_KAS_VERSION @@ -1 +1 @@ -18.2.0 \ No newline at end of file +18.2.1 \ No newline at end of file diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION index 585739b67d..745b490654 100644 --- a/GITLAB_PAGES_VERSION +++ b/GITLAB_PAGES_VERSION @@ -1 +1 @@ -18.2.0 \ No newline at end of file +18.2.1 \ No newline at end of file From 63e89932244b8ad1f62464082e8b1f642eec4ac4 Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Tue, 22 Jul 2025 11:47:16 +0000 Subject: [PATCH 18/43] Set QA test targets for 18.2.1+ee.0 [ci skip] --- gitlab-ci-config/variables.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab-ci-config/variables.yml b/gitlab-ci-config/variables.yml index da226015a0..c08423d1c7 100644 --- a/gitlab-ci-config/variables.yml +++ b/gitlab-ci-config/variables.yml @@ -38,8 +38,8 @@ variables: PACKAGE_PROMOTION_RUNNER_TAG: promotion NIGHTLY_REPO: nightly-builds NIGHTLY_FIPS_REPO: nightly-fips-builds - QA_TESTS_UPSTREAM_PROJECT: gitlab-org/gitlab - QA_TESTS_REF: 18-2-stable-ee + QA_TESTS_UPSTREAM_PROJECT: gitlab-org/security/gitlab-foss + QA_TESTS_REF: 18-2-stable OPENSSL_VERSION: 3.4.1 FF_TIMESTAMPS: true OPENSSL_GEM_VERSION: "~> 3.2.0" From 76bf0b3872b8c388635f0a2bd91723aa8ad241cf Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Tue, 22 Jul 2025 11:47:17 +0000 Subject: [PATCH 19/43] Update VERSION to 18.2.1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 0cd660a0d7..745b490654 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.2.0-ee \ No newline at end of file +18.2.1 \ No newline at end of file From 9eb8c9b3f9a5f14f24b93720c9e9d16da082493c Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Tue, 22 Jul 2025 11:47:22 +0000 Subject: [PATCH 20/43] Set QA test targets for 18.2.1+ee.0 [ci skip] --- gitlab-ci-config/variables.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab-ci-config/variables.yml b/gitlab-ci-config/variables.yml index c08423d1c7..1cc2b6eb90 100644 --- a/gitlab-ci-config/variables.yml +++ b/gitlab-ci-config/variables.yml @@ -38,8 +38,8 @@ variables: PACKAGE_PROMOTION_RUNNER_TAG: promotion NIGHTLY_REPO: nightly-builds NIGHTLY_FIPS_REPO: nightly-fips-builds - QA_TESTS_UPSTREAM_PROJECT: gitlab-org/security/gitlab-foss - QA_TESTS_REF: 18-2-stable + QA_TESTS_UPSTREAM_PROJECT: gitlab-org/security/gitlab + QA_TESTS_REF: 18-2-stable-ee OPENSSL_VERSION: 3.4.1 FF_TIMESTAMPS: true OPENSSL_GEM_VERSION: "~> 3.2.0" From 73279e3c264031c4bb55c4596e55fa302a8ee20e Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Tue, 22 Jul 2025 11:47:24 +0000 Subject: [PATCH 21/43] Update VERSION to 18.2.1-ee --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 745b490654..c8b05f2566 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.2.1 \ No newline at end of file +18.2.1-ee \ No newline at end of file From 7b3e18a84f5f4fc4432bc0c21a3281b091afeea3 Mon Sep 17 00:00:00 2001 From: Dat Tang Date: Fri, 25 Jul 2025 14:06:32 +0200 Subject: [PATCH 22/43] Merge branch 'dattang/use-ci-var-to-check-on-tag' into 'master' Use CI_COMMIT_TAG to check on_tag? See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/8583 Merged-by: Balasankar 'Balu' C Approved-by: Balasankar 'Balu' C Reviewed-by: GitLab Duo Co-authored-by: Dat Tang (cherry picked from commit e5270488af5498297c74234eede0f0590c819787) d2032720 Use CI_COMMIT_TAG to check on_tag? acdb4602 Apply 1 suggestion(s) to 1 file(s) 4a136b16 Only check ci_commit_tag? for on_tag? if running on ci Co-authored-by: Balasankar 'Balu' C --- lib/gitlab/build/check.rb | 8 +++++ spec/lib/gitlab/build/check_spec.rb | 46 +++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/lib/gitlab/build/check.rb b/lib/gitlab/build/check.rb index 227518658b..1dee1ea069 100644 --- a/lib/gitlab/build/check.rb +++ b/lib/gitlab/build/check.rb @@ -97,7 +97,15 @@ def no_changes? system(*%w[git diff --quiet]) end + def run_on_ci? + Gitlab::Util.get_env('GITLAB_CI') + end + def on_tag? + # On GitLab CI, check if it is a tag pipeline + return ci_commit_tag? if run_on_ci? + + # Fallback to git describe for local/non-CI environments system('git describe --exact-match > /dev/null 2>&1') end diff --git a/spec/lib/gitlab/build/check_spec.rb b/spec/lib/gitlab/build/check_spec.rb index 0fe9d63f43..cb5557b424 100644 --- a/spec/lib/gitlab/build/check_spec.rb +++ b/spec/lib/gitlab/build/check_spec.rb @@ -172,6 +172,52 @@ end end + describe 'run_on_ci?' do + it 'returns true when GITLAB_CI environment variable is set' do + allow(Gitlab::Util).to receive(:get_env).with('GITLAB_CI').and_return('true') + expect(described_class.run_on_ci?).to be_truthy + end + + it 'returns false when GITLAB_CI environment variable is not set' do + allow(Gitlab::Util).to receive(:get_env).with('GITLAB_CI').and_return(nil) + expect(described_class.run_on_ci?).to be_falsey + end + end + + describe 'on_tag?' do + context 'when running on CI' do + before do + allow(described_class).to receive(:run_on_ci?).and_return(true) + end + + it 'returns the correct value based on ci_commit_tag? result' do + [ + { ci_commit_tag_result: true, expected: be_truthy }, + { ci_commit_tag_result: false, expected: be_falsey } + ].each do |test_case| + allow(described_class).to receive(:ci_commit_tag?).and_return(test_case[:ci_commit_tag_result]) + expect(described_class.on_tag?).to test_case[:expected] + end + end + end + + context 'when not running on CI' do + before do + allow(described_class).to receive(:run_on_ci?).and_return(false) + end + + it 'returns the correct value based on git describe --exact-match result' do + [ + { git_result: true, expected: be_truthy }, + { git_result: false, expected: be_falsey } + ].each do |test_case| + allow(described_class).to receive(:system).with('git describe --exact-match > /dev/null 2>&1').and_return(test_case[:git_result]) + expect(described_class.on_tag?).to test_case[:expected] + end + end + end + end + describe 'on_stable_branch?' do context 'when on a stable branch' do before do From 529d34fbbffca1f4877e8fb58bef3a0e1d9c3034 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Wed, 30 Jul 2025 10:53:20 -0700 Subject: [PATCH 23/43] Fix deprecation check failing on nil values This is a regression in GitLab 18.2 from due to https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/8470. Previously a blank default version were provided to `check_config`. Now the value can be `nil` if the JSON nodes file does not have the value. Fix this by handling this `nil` value gracefully. Relates to https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/9217 Changelog: fixed --- files/gitlab-cookbooks/package/libraries/deprecations.rb | 2 +- spec/chef/cookbooks/package/libraries/deprecations_spec.rb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/files/gitlab-cookbooks/package/libraries/deprecations.rb b/files/gitlab-cookbooks/package/libraries/deprecations.rb index 35635631fb..f576bf0f42 100644 --- a/files/gitlab-cookbooks/package/libraries/deprecations.rb +++ b/files/gitlab-cookbooks/package/libraries/deprecations.rb @@ -90,7 +90,7 @@ def next_major_version def applicable_deprecations(incoming_version, existing_config, type) # Return the list of deprecations or removals that are applicable with # a given list of configuration for a specific version. - incoming_version = next_major_version if incoming_version.empty? + incoming_version = next_major_version if incoming_version&.empty? return [] unless incoming_version version = Gem::Version.new(incoming_version) diff --git a/spec/chef/cookbooks/package/libraries/deprecations_spec.rb b/spec/chef/cookbooks/package/libraries/deprecations_spec.rb index 148b3f952c..5879975ca5 100644 --- a/spec/chef/cookbooks/package/libraries/deprecations_spec.rb +++ b/spec/chef/cookbooks/package/libraries/deprecations_spec.rb @@ -98,6 +98,10 @@ expect(described_class.check_config("11.0", valid_config)).to eq([]) end + it 'handles nil incoming version' do + expect(described_class.check_config(nil, valid_config)).to eq([]) + end + it 'detects deprecated configuration for specified version and ignores not yet deprecated ones' do message_1 = "* nginx['listen_address'] has been deprecated since 8.10 and was removed in 11.0. Use nginx['listen_addresses'] instead." message_2 = "* gitlab_rails['stuck_ci_builds_worker_cron'] has been deprecated since 9.0 and was removed in 12.0. Use gitlab_rails['stuck_ci_jobs_worker_cron'] instead." From 4400ab9d68be8a358481e794cd59b04b22459654 Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Tue, 12 Aug 2025 12:40:33 +0000 Subject: [PATCH 24/43] Update changelog for 18.2.2 [ci skip] --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1aafc2ac4a..4f96c03b9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ The latest version of this file can be found at the master branch of the omnibus-gitlab repository. +## 18.2.2 (2025-08-12) + +### Fixed (1 change) + +- [Fix deprecation check failing on nil values](gitlab-org/security/omnibus-gitlab@529d34fbbffca1f4877e8fb58bef3a0e1d9c3034) + ## 18.2.1 (2025-07-22) No changes. From 8395435a461cb4c9754237a283146eb0a2765541 Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Tue, 12 Aug 2025 12:40:45 +0000 Subject: [PATCH 25/43] Update component version files --- GITALY_SERVER_VERSION | 2 +- GITLAB_KAS_VERSION | 2 +- GITLAB_PAGES_VERSION | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 745b490654..e1dc037df3 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -18.2.1 \ No newline at end of file +18.2.2 \ No newline at end of file diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION index 745b490654..e1dc037df3 100644 --- a/GITLAB_KAS_VERSION +++ b/GITLAB_KAS_VERSION @@ -1 +1 @@ -18.2.1 \ No newline at end of file +18.2.2 \ No newline at end of file diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION index 745b490654..e1dc037df3 100644 --- a/GITLAB_PAGES_VERSION +++ b/GITLAB_PAGES_VERSION @@ -1 +1 @@ -18.2.1 \ No newline at end of file +18.2.2 \ No newline at end of file From 3a5267bfd01dfe5b08f05409ddb6567b8459c15d Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Tue, 12 Aug 2025 12:40:50 +0000 Subject: [PATCH 26/43] Set QA test targets for 18.2.2+ee.0 [ci skip] --- gitlab-ci-config/variables.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab-ci-config/variables.yml b/gitlab-ci-config/variables.yml index 1cc2b6eb90..c08423d1c7 100644 --- a/gitlab-ci-config/variables.yml +++ b/gitlab-ci-config/variables.yml @@ -38,8 +38,8 @@ variables: PACKAGE_PROMOTION_RUNNER_TAG: promotion NIGHTLY_REPO: nightly-builds NIGHTLY_FIPS_REPO: nightly-fips-builds - QA_TESTS_UPSTREAM_PROJECT: gitlab-org/security/gitlab - QA_TESTS_REF: 18-2-stable-ee + QA_TESTS_UPSTREAM_PROJECT: gitlab-org/security/gitlab-foss + QA_TESTS_REF: 18-2-stable OPENSSL_VERSION: 3.4.1 FF_TIMESTAMPS: true OPENSSL_GEM_VERSION: "~> 3.2.0" From b23b35c5a70d073aecd48f5fee4b7f5970ff4f2c Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Tue, 12 Aug 2025 12:40:52 +0000 Subject: [PATCH 27/43] Update VERSION to 18.2.2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index c8b05f2566..e1dc037df3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.2.1-ee \ No newline at end of file +18.2.2 \ No newline at end of file From 4beccb1adb2eaceba4e54ec32e9031c6a6c32cc8 Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Tue, 12 Aug 2025 12:40:58 +0000 Subject: [PATCH 28/43] Set QA test targets for 18.2.2+ee.0 [ci skip] --- gitlab-ci-config/variables.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab-ci-config/variables.yml b/gitlab-ci-config/variables.yml index c08423d1c7..1cc2b6eb90 100644 --- a/gitlab-ci-config/variables.yml +++ b/gitlab-ci-config/variables.yml @@ -38,8 +38,8 @@ variables: PACKAGE_PROMOTION_RUNNER_TAG: promotion NIGHTLY_REPO: nightly-builds NIGHTLY_FIPS_REPO: nightly-fips-builds - QA_TESTS_UPSTREAM_PROJECT: gitlab-org/security/gitlab-foss - QA_TESTS_REF: 18-2-stable + QA_TESTS_UPSTREAM_PROJECT: gitlab-org/security/gitlab + QA_TESTS_REF: 18-2-stable-ee OPENSSL_VERSION: 3.4.1 FF_TIMESTAMPS: true OPENSSL_GEM_VERSION: "~> 3.2.0" From 5c65cbe9356edaabf17e45adf812e84b078f7287 Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Tue, 12 Aug 2025 12:41:07 +0000 Subject: [PATCH 29/43] Update VERSION to 18.2.2-ee --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index e1dc037df3..3e0dabc221 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.2.2 \ No newline at end of file +18.2.2-ee \ No newline at end of file From 0eb6aead1d505969173574f864e6466e3a79b557 Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Mon, 18 Aug 2025 13:06:37 +0000 Subject: [PATCH 30/43] Update changelog for 18.2.3 [ci skip] --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f96c03b9f..bfbe35b5d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ The latest version of this file can be found at the master branch of the omnibus-gitlab repository. +## 18.2.3 (2025-08-18) + +No changes. + ## 18.2.2 (2025-08-12) ### Fixed (1 change) From b223d04da4bda37a1cbff843c9216fd940c6aef4 Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Mon, 18 Aug 2025 13:06:50 +0000 Subject: [PATCH 31/43] Update component version files --- GITALY_SERVER_VERSION | 2 +- GITLAB_KAS_VERSION | 2 +- GITLAB_PAGES_VERSION | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index e1dc037df3..d2dc1a569c 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -18.2.2 \ No newline at end of file +18.2.3 \ No newline at end of file diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION index e1dc037df3..d2dc1a569c 100644 --- a/GITLAB_KAS_VERSION +++ b/GITLAB_KAS_VERSION @@ -1 +1 @@ -18.2.2 \ No newline at end of file +18.2.3 \ No newline at end of file diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION index e1dc037df3..d2dc1a569c 100644 --- a/GITLAB_PAGES_VERSION +++ b/GITLAB_PAGES_VERSION @@ -1 +1 @@ -18.2.2 \ No newline at end of file +18.2.3 \ No newline at end of file From 1999a16dc238dcbd4faa63820267010644237d8f Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Mon, 18 Aug 2025 13:07:00 +0000 Subject: [PATCH 32/43] Set QA test targets for 18.2.3+ee.0 [ci skip] --- gitlab-ci-config/variables.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab-ci-config/variables.yml b/gitlab-ci-config/variables.yml index 1cc2b6eb90..2e7948fe7d 100644 --- a/gitlab-ci-config/variables.yml +++ b/gitlab-ci-config/variables.yml @@ -38,8 +38,8 @@ variables: PACKAGE_PROMOTION_RUNNER_TAG: promotion NIGHTLY_REPO: nightly-builds NIGHTLY_FIPS_REPO: nightly-fips-builds - QA_TESTS_UPSTREAM_PROJECT: gitlab-org/security/gitlab - QA_TESTS_REF: 18-2-stable-ee + QA_TESTS_UPSTREAM_PROJECT: gitlab-org/gitlab-foss + QA_TESTS_REF: 18-2-stable OPENSSL_VERSION: 3.4.1 FF_TIMESTAMPS: true OPENSSL_GEM_VERSION: "~> 3.2.0" From 0e976e7731a58ee229d5bc79603fe42a05cae4f9 Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Mon, 18 Aug 2025 13:32:11 +0000 Subject: [PATCH 33/43] Update VERSION to 18.2.3 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 3e0dabc221..d2dc1a569c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.2.2-ee \ No newline at end of file +18.2.3 \ No newline at end of file From 197dca04f4b2e66dd62dc34d1f2fb3e72915b08c Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Mon, 18 Aug 2025 13:32:16 +0000 Subject: [PATCH 34/43] Set QA test targets for 18.2.3+ee.0 [ci skip] --- gitlab-ci-config/variables.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab-ci-config/variables.yml b/gitlab-ci-config/variables.yml index 2e7948fe7d..da226015a0 100644 --- a/gitlab-ci-config/variables.yml +++ b/gitlab-ci-config/variables.yml @@ -38,8 +38,8 @@ variables: PACKAGE_PROMOTION_RUNNER_TAG: promotion NIGHTLY_REPO: nightly-builds NIGHTLY_FIPS_REPO: nightly-fips-builds - QA_TESTS_UPSTREAM_PROJECT: gitlab-org/gitlab-foss - QA_TESTS_REF: 18-2-stable + QA_TESTS_UPSTREAM_PROJECT: gitlab-org/gitlab + QA_TESTS_REF: 18-2-stable-ee OPENSSL_VERSION: 3.4.1 FF_TIMESTAMPS: true OPENSSL_GEM_VERSION: "~> 3.2.0" From e5cd8cd0b120612a61165dbce669f17e07e6416b Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Mon, 18 Aug 2025 13:32:19 +0000 Subject: [PATCH 35/43] Update VERSION to 18.2.3-ee --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index d2dc1a569c..ee36442414 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.2.3 \ No newline at end of file +18.2.3-ee \ No newline at end of file From 96c74dfe2a4245c05cfebf061d0f17c0c56b01f9 Mon Sep 17 00:00:00 2001 From: Alec Xu Date: Fri, 15 Aug 2025 23:43:31 -0700 Subject: [PATCH 36/43] Build with Go 1.24.5 Changelog: changed --- gitlab-ci-config/variables.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab-ci-config/variables.yml b/gitlab-ci-config/variables.yml index da226015a0..de3d784158 100644 --- a/gitlab-ci-config/variables.yml +++ b/gitlab-ci-config/variables.yml @@ -3,7 +3,7 @@ variables: BUILDER_IMAGE_REGISTRY: registry.gitlab.com/gitlab-org/gitlab-omnibus-builder 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: 5.34.0 + BUILDER_IMAGE_REVISION: 5.39.0 ASSET_REGISTRY: "${CI_REGISTRY}" ASSET_SYNC_EXISTING_REMOTE_FILES: keep ASSET_SYNC_GZIP_COMPRESSION: 'true' From 1583a6690ecd616a4b7126278db1e6e3610b3f8d Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Mon, 18 Aug 2025 08:21:55 -0700 Subject: [PATCH 37/43] Backport "--without-brotli" flag for fixing Git builds This pulls in the change from https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/8627. Relates to https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/9224 --- config/software/curl.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/software/curl.rb b/config/software/curl.rb index 5115f89c54..eebbe7c256 100644 --- a/config/software/curl.rb +++ b/config/software/curl.rb @@ -69,7 +69,8 @@ "--without-ca-bundle", "--with-ca-fallback", "--without-zstd", - "-without-libpsl" + "--without-libpsl", + "--without-brotli" ] openssl_library_path = "=#{install_dir}/embedded" unless Build::Check.use_system_ssl? From 251738bbe58aeceb4d2ca985635fb94d9466ec44 Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Mon, 18 Aug 2025 18:11:22 +0000 Subject: [PATCH 38/43] Update changelog for 18.2.4 [ci skip] --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bfbe35b5d0..cb4b2a3507 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ The latest version of this file can be found at the master branch of the omnibus-gitlab repository. +## 18.2.4 (2025-08-18) + +### Changed (1 change) + +- [Build with Go 1.24.5](gitlab-org/omnibus-gitlab@96c74dfe2a4245c05cfebf061d0f17c0c56b01f9) ([merge request](gitlab-org/omnibus-gitlab!8658)) + ## 18.2.3 (2025-08-18) No changes. From 1965e422a64fd1097b798098feb9531e96654171 Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Mon, 18 Aug 2025 18:11:32 +0000 Subject: [PATCH 39/43] Update component version files --- GITALY_SERVER_VERSION | 2 +- GITLAB_KAS_VERSION | 2 +- GITLAB_PAGES_VERSION | 2 +- GITLAB_SHELL_VERSION | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index d2dc1a569c..523096c786 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -18.2.3 \ No newline at end of file +18.2.4 \ No newline at end of file diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION index d2dc1a569c..523096c786 100644 --- a/GITLAB_KAS_VERSION +++ b/GITLAB_KAS_VERSION @@ -1 +1 @@ -18.2.3 \ No newline at end of file +18.2.4 \ No newline at end of file diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION index d2dc1a569c..523096c786 100644 --- a/GITLAB_PAGES_VERSION +++ b/GITLAB_PAGES_VERSION @@ -1 +1 @@ -18.2.3 \ No newline at end of file +18.2.4 \ No newline at end of file diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION index 6ae2739c66..5c5b951eaf 100644 --- a/GITLAB_SHELL_VERSION +++ b/GITLAB_SHELL_VERSION @@ -1 +1 @@ -14.43.0 \ No newline at end of file +14.44.0 \ No newline at end of file From 8e71921fcd22da7174ac09b86c02cd9eaeede93d Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Mon, 18 Aug 2025 18:11:37 +0000 Subject: [PATCH 40/43] Set QA test targets for 18.2.4+ee.0 [ci skip] --- gitlab-ci-config/variables.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab-ci-config/variables.yml b/gitlab-ci-config/variables.yml index de3d784158..a1ca7c3d01 100644 --- a/gitlab-ci-config/variables.yml +++ b/gitlab-ci-config/variables.yml @@ -38,8 +38,8 @@ variables: PACKAGE_PROMOTION_RUNNER_TAG: promotion NIGHTLY_REPO: nightly-builds NIGHTLY_FIPS_REPO: nightly-fips-builds - QA_TESTS_UPSTREAM_PROJECT: gitlab-org/gitlab - QA_TESTS_REF: 18-2-stable-ee + QA_TESTS_UPSTREAM_PROJECT: gitlab-org/gitlab-foss + QA_TESTS_REF: 18-2-stable OPENSSL_VERSION: 3.4.1 FF_TIMESTAMPS: true OPENSSL_GEM_VERSION: "~> 3.2.0" From af0630cbecd262caab9d30b7e30e062417eef3c7 Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Mon, 18 Aug 2025 18:11:42 +0000 Subject: [PATCH 41/43] Update VERSION to 18.2.4 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index ee36442414..523096c786 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.2.3-ee \ No newline at end of file +18.2.4 \ No newline at end of file From 9fb8bb69bee0ff93fe23f56fd87c4644a11daf8e Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Mon, 18 Aug 2025 18:11:46 +0000 Subject: [PATCH 42/43] Set QA test targets for 18.2.4+ee.0 [ci skip] --- gitlab-ci-config/variables.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab-ci-config/variables.yml b/gitlab-ci-config/variables.yml index a1ca7c3d01..de3d784158 100644 --- a/gitlab-ci-config/variables.yml +++ b/gitlab-ci-config/variables.yml @@ -38,8 +38,8 @@ variables: PACKAGE_PROMOTION_RUNNER_TAG: promotion NIGHTLY_REPO: nightly-builds NIGHTLY_FIPS_REPO: nightly-fips-builds - QA_TESTS_UPSTREAM_PROJECT: gitlab-org/gitlab-foss - QA_TESTS_REF: 18-2-stable + QA_TESTS_UPSTREAM_PROJECT: gitlab-org/gitlab + QA_TESTS_REF: 18-2-stable-ee OPENSSL_VERSION: 3.4.1 FF_TIMESTAMPS: true OPENSSL_GEM_VERSION: "~> 3.2.0" From def0574ac8c8ee7011760b434c3c3fddb5fc5f6e Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Mon, 18 Aug 2025 18:11:48 +0000 Subject: [PATCH 43/43] Update VERSION to 18.2.4-ee --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 523096c786..58ab14e41f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.2.4 \ No newline at end of file +18.2.4-ee \ No newline at end of file