From c236d0d528a9957b4809e80bf7772533c0717ae8 Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <jen-shin@gitlab.com>
Date: Thu, 4 Jan 2024 16:13:09 +0000
Subject: [PATCH] Simplify and clarify Ruby version related variables we're
using/passing
---
.gitlab-ci.yml | 6 +++---
.gitlab/ci/cng/main.gitlab-ci.yml | 2 --
.gitlab/ci/qa.gitlab-ci.yml | 5 +++--
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 490d3b3f48798..6acf982fd553b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,15 +29,15 @@ default:
.old-ruby-variables: &old-ruby-variables
RUBY_VERSION: "3.0"
- CACHE_EDITION: "GITLAB_RUBY3_0"
+ OMNIBUS_GITLAB_CACHE_EDITION: "GITLAB_RUBY3_0"
.default-ruby-variables: &default-ruby-variables
RUBY_VERSION: "3.1"
- CACHE_EDITION: "GITLAB_RUBY3_1"
+ OMNIBUS_GITLAB_CACHE_EDITION: "GITLAB_RUBY3_1"
.next-ruby-variables: &next-ruby-variables
RUBY_VERSION: "3.2"
- CACHE_EDITION: "GITLAB_RUBY3_2"
+ OMNIBUS_GITLAB_CACHE_EDITION: "GITLAB_RUBY3_2"
.default-branch-pipeline-failure-variables: &default-branch-pipeline-failure-variables
CREATE_RAILS_TEST_FAILURE_ISSUES: "true"
diff --git a/.gitlab/ci/cng/main.gitlab-ci.yml b/.gitlab/ci/cng/main.gitlab-ci.yml
index 1ecbbbd47adf7..d27a4ef4b0874 100644
--- a/.gitlab/ci/cng/main.gitlab-ci.yml
+++ b/.gitlab/ci/cng/main.gitlab-ci.yml
@@ -54,8 +54,6 @@ include:
GITLAB_WORKHORSE_VERSION: "${GITLAB_WORKHORSE_VERSION}"
GITALY_SERVER_VERSION: "${GITALY_SERVER_VERSION}"
RUBY_VERSION: "${FULL_RUBY_VERSION}"
- NEXT_RUBY_CACHE_KEY: "${RUBY_VERSION}"
- NEXT_RUBY_VERSION: "${FULL_RUBY_VERSION}"
trigger:
project: ${CI_PROJECT_NAMESPACE}/build/CNG-mirror
branch: $TRIGGER_BRANCH
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml
index b7716fc280eab..a77a8bfd25282 100644
--- a/.gitlab/ci/qa.gitlab-ci.yml
+++ b/.gitlab/ci/qa.gitlab-ci.yml
@@ -90,8 +90,9 @@ trigger-omnibus:
TOP_UPSTREAM_SOURCE_PROJECT: $CI_PROJECT_PATH
SECURITY_SOURCES: $SECURITY_SOURCES
CACHE_UPDATE: $OMNIBUS_GITLAB_CACHE_UPDATE
- CACHE_EDITION: $CACHE_EDITION
- NEXT_RUBY_VERSION: $FULL_RUBY_VERSION
+ CACHE_EDITION: $OMNIBUS_GITLAB_CACHE_EDITION
+ USE_SPECIFIED_RUBY_VERSION: "true"
+ RUBY_VERSION: $FULL_RUBY_VERSION
BUILD_ON_ALL_OS: $OMNIBUS_GITLAB_BUILD_ON_ALL_OS
SKIP_QA_TEST: "true"
ee: $EE
--
GitLab