diff --git a/ci_files/variables.yml b/ci_files/variables.yml
index abdb6c880b42954edf3ac5d1f4715f4fed47267d..3c852c8e2bbe6f26dffd7c5e377e9a424c7c242d 100644
--- a/ci_files/variables.yml
+++ b/ci_files/variables.yml
@@ -1,90 +1,65 @@
variables:
- # Base distribution
- DEBIAN_IMAGE: "debian:bookworm-slim"
- UBI_IMAGE: "registry.access.redhat.com/ubi9/ubi-minimal:9.4"
- UBI_MICRO_IMAGE: "registry.access.redhat.com/ubi9/ubi-micro:9.4"
- ALPINE_IMAGE: "alpine:3.15"
-
- # GitLab Application Components
- GITLAB_ELASTICSEARCH_INDEXER_VERSION: "main"
- GITLAB_VERSION: "main-jh"
- GITLAB_REF_SLUG: "main-jh"
- GITLAB_ASSETS_TAG: "main-jh"
- GITLAB_EXPORTER_VERSION: "15.0.0"
- GITLAB_SHELL_VERSION: "main"
- GITLAB_CONTAINER_REGISTRY_VERSION: "v4.13.0-gitlab"
- GITALY_SERVER_VERSION: "master"
- GITLAB_PAGES_VERSION: "master"
- GITLAB_KAS_VERSION: "master"
- MAILROOM_VERSION: "0.0.25"
- GITLAB_ZOEKT_WEBSERVER_VERSION: "v0.1.0-b8ea9"
- GITLAB_ZOEKT_DYNAMIC_INDEXSERVER_VERSION: "v0.1.0-b8ea9"
- GITLAB_ZOEKT_INDEXER_VERSION: "v0.8.5-64175"
- ZOEKT_VERSION: "b8ea92de2f6c3fc952e9ec3d1df1f58be9a40d80"
- ZOEKT_INDEXER_VERSION: "v0.8.5-64175"
-
- # Runtimes & Tools
- GIT_VERSION: "2.29.0"
- GIT_FILTER_REPO_VERSION: "2.45.0"
- # Follow the Go upgrade guidelines when changing the Go version
- # link: https://docs.gitlab.com/ee/development/go_guide/go_upgrade.html
- GO_VERSION: "1.23.2"
- GO_FIPS_VERSION: "1.23.2"
- GO_FIPS_TAG: "go1.23.2-2-openssl-fips"
- # Follow the Ruby upgrade guidelines when changing the ruby version
- # link: https://docs.gitlab.com/ee/development/ruby_upgrade.html
- RUBY_VERSION: 3.2.5
- NEXT_RUBY_VERSION: 3.2.5
- RUBYGEMS_VERSION: "3.5.22"
- BUNDLER_VERSION: "2.5.22"
- OPENSSL_GEM_VERSION: "~>3.2.0"
- RUST_VERSION: 1.73.0
- PYTHON_VERSION: "3.9.20"
- KUBECTL_VERSION: "1.31.2"
- YQ_VERSION: "4.44.3"
- PG_VERSION: "16.4"
- CA_PKG_VERSION: "20220614-r0"
- CFSSL_VERSION: "1.6.1"
- CFSSL_CHECKSUM_SHA256: "89e600cd5203a025f8b47c6cd5abb9a74b06e3c7f7f7dd3f5b2a00975b15a491"
- AWSCLI_VERSION: "1.35.20"
- S3CMD_VERSION: "2.4.0"
- GM_VERSION: "1.3.36"
- GM_CHECKSUM_SHA256: "5d5b3fde759cdfc307aaf21df9ebd8c752e3f088bb051dd5df8aac7ba7338f46"
- GITLAB_LOGGER_VERSION: "v3.0.0"
- GITLAB_LOGGER_SHA256: "b6bca21e3eba525334f4b140d9d9405181a25821365ccd9065402fa050af78d5"
- GOMPLATE_VERSION: "v3.11.8"
- GOMPLATE_SHA256: "a38ba762e57a0aa5d7040f818a1ddbb613c42bf0432c897e33a99d21388ecdc7"
- EXIFTOOL_VERSION: "12.98"
-
- # Docker configuration
+ ALPINE_IMAGE: alpine:3.15
+ ASSETS_IMAGE_PREFIX: gitlab-assets
+ ASSETS_IMAGE_REGISTRY_PREFIX: registry.gitlab.com/gitlab-org
+ AWSCLI_VERSION: 1.35.20
+ BUILDX_CPU_LIMIT: "2"
+ BUILDX_MEMORY_LIMIT: 5G
+ BUNDLER_VERSION: 2.5.22
+ CA_PKG_VERSION: 20220614-r0
+ CE_PROJECT: gitlab-foss
+ CFSSL_CHECKSUM_SHA256: 89e600cd5203a025f8b47c6cd5abb9a74b06e3c7f7f7dd3f5b2a00975b15a491
+ CFSSL_VERSION: 1.6.1
+ COMPILE_ASSETS: "false"
+ DEBIAN_IMAGE: debian:bookworm-slim
+ DNF_INSTALL_ROOT: /install-root
+ DNF_OPTS_ROOT: --installroot=${DNF_INSTALL_ROOT} --setopt=reposdir=${DNF_INSTALL_ROOT}/etc/yum.repos.d/
+ --setopt=cachedir=/install-cache/ --setopt=varsdir= --config= --noplugins
DOCKER_DRIVER: overlay2
DOCKER_HOST: tcp://docker:2375
DOCKER_TLS_CERTDIR: ""
-
- # Pipeline config
- ASSETS_IMAGE_PREFIX: "gitlab-assets"
- ASSETS_IMAGE_REGISTRY_PREFIX: "registry.gitlab.com/gitlab-org"
- PREFLIGHT_IMAGE_PREFIX: "cloud-native"
- PREFLIGHT_IMAGE_REGISTRY_PREFIX: "registry.gitlab.com/gitlab-org"
- PREFLIGHT_IMAGE_TAG: "1.10.0"
- GITLAB_NAMESPACE: "gitlab-org"
- CE_PROJECT: "gitlab-foss"
- EE_PROJECT: "gitlab"
- COMPILE_ASSETS: "false"
-
- # installroot configuration
- DNF_INSTALL_ROOT: /install-root
- DNF_OPTS_ROOT: "--installroot=${DNF_INSTALL_ROOT} --setopt=reposdir=${DNF_INSTALL_ROOT}/etc/yum.repos.d/ --setopt=cachedir=/install-cache/ --setopt=varsdir= --config= --noplugins"
-
- BUILDX_CPU_LIMIT: "2"
- BUILDX_MEMORY_LIMIT: "5G"
-
-## Note
-# Variables ASSETS_IMAGE_REGISTRY_PREFIX, PREFIX_IMAGE_REGISTRY_PREFIX,
-# GITLAB_NAMESPACE and CE_PROJECT are overridden in the mirror of this
-# project in dev.gitlab.org to match their dev counterpart locations.
-
-## Note
-# Forcing complete rebuilds requires setting two items:
-# FORCE_IMAGE_BUILDS=true
-# DISABLE_DOCKER_BUILD_CACHE=true
+ EE_PROJECT: gitlab
+ EXIFTOOL_VERSION: "12.98"
+ GIT_FILTER_REPO_VERSION: 2.45.0
+ GIT_VERSION: 2.29.0
+ GITALY_SERVER_VERSION: a3b447448698d44d0c93138fa68c1877c5bab70e
+ GITLAB_ASSETS_TAG: 0d06aadd85dbf6af2dc63879e203fd14d622a5b5
+ GITLAB_CONTAINER_REGISTRY_VERSION: v4.13.0-gitlab
+ GITLAB_ELASTICSEARCH_INDEXER_VERSION: v5.4.0
+ GITLAB_EXPORTER_VERSION: 15.0.0
+ GITLAB_KAS_VERSION: eebf475a4a423f93d58ecb66152ca96261c2f8dc
+ GITLAB_LOGGER_SHA256: b6bca21e3eba525334f4b140d9d9405181a25821365ccd9065402fa050af78d5
+ GITLAB_LOGGER_VERSION: v3.0.0
+ GITLAB_NAMESPACE: gitlab-org
+ GITLAB_PAGES_VERSION: 6546b58c9c2eb0a7696b5d6d876980dec961a9f9
+ GITLAB_REF_SLUG: 0d06aadd85dbf6af2dc63879e203fd14d622a5b5
+ GITLAB_SHELL_VERSION: v14.39.0
+ GITLAB_VERSION: 0d06aadd85dbf6af2dc63879e203fd14d622a5b5
+ GITLAB_ZOEKT_DYNAMIC_INDEXSERVER_VERSION: v0.1.0-b8ea9
+ GITLAB_ZOEKT_INDEXER_VERSION: v0.8.5-64175
+ GITLAB_ZOEKT_WEBSERVER_VERSION: v0.1.0-b8ea9
+ GM_CHECKSUM_SHA256: 5d5b3fde759cdfc307aaf21df9ebd8c752e3f088bb051dd5df8aac7ba7338f46
+ GM_VERSION: 1.3.36
+ GO_FIPS_TAG: go1.23.2-2-openssl-fips
+ GO_FIPS_VERSION: 1.23.2
+ GO_VERSION: 1.23.2
+ GOMPLATE_SHA256: a38ba762e57a0aa5d7040f818a1ddbb613c42bf0432c897e33a99d21388ecdc7
+ GOMPLATE_VERSION: v3.11.8
+ KUBECTL_VERSION: 1.31.2
+ MAILROOM_VERSION: 0.0.25
+ NEXT_RUBY_VERSION: 3.2.5
+ OPENSSL_GEM_VERSION: ~>3.2.0
+ PG_VERSION: "16.4"
+ PREFLIGHT_IMAGE_PREFIX: cloud-native
+ PREFLIGHT_IMAGE_REGISTRY_PREFIX: registry.gitlab.com/gitlab-org
+ PREFLIGHT_IMAGE_TAG: 1.10.0
+ PYTHON_VERSION: 3.9.20
+ RUBY_VERSION: 3.2.5
+ RUBYGEMS_VERSION: 3.5.22
+ RUST_VERSION: 1.73.0
+ S3CMD_VERSION: 2.4.0
+ UBI_IMAGE: registry.access.redhat.com/ubi9/ubi-minimal:9.4
+ UBI_MICRO_IMAGE: registry.access.redhat.com/ubi9/ubi-micro:9.4
+ YQ_VERSION: 4.44.3
+ ZOEKT_INDEXER_VERSION: v0.8.5-64175
+ ZOEKT_VERSION: b8ea92de2f6c3fc952e9ec3d1df1f58be9a40d80