From 52a25ccebbc6e0795b1c3d1ace67e8a275272e29 Mon Sep 17 00:00:00 2001
From: Igor Drozdov <idrozdov@gitlab.com>
Date: Fri, 26 Jul 2024 17:31:26 +0200
Subject: [PATCH] Specify BUNDLE_GEMFILE as Gemfile.next for CI

---
 .gitlab-ci.yml                     | 1 +
 .gitlab/ci/preflight.gitlab-ci.yml | 1 +
 .gitlab/ci/qa.gitlab-ci.yml        | 1 +
 spec/dot_gitlab_ci/rules_spec.rb   | 3 +++
 4 files changed, 6 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e6397c9e92a1bc6d..134ba036bdf5834b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -182,6 +182,7 @@ variables:
   CI_FETCH_REPO_GIT_STRATEGY: "none"
   FORCE_COLOR: 1
   CLICOLOR_FORCE: 1
+  BUNDLE_GEMFILE: "Gemfile.next"
 
   FLAKY_RSPEC_SUITE_REPORT_PATH: rspec/flaky/report-suite.json
   FRONTEND_FIXTURES_MAPPING_PATH: crystalball/frontend_fixtures_mapping.json
diff --git a/.gitlab/ci/preflight.gitlab-ci.yml b/.gitlab/ci/preflight.gitlab-ci.yml
index e2132d3eeecb5f75..b28131949c0524a3 100644
--- a/.gitlab/ci/preflight.gitlab-ci.yml
+++ b/.gitlab/ci/preflight.gitlab-ci.yml
@@ -11,6 +11,7 @@
     - .qa-cache
   variables:
     USE_BUNDLE_INSTALL: "false"
+    BUNDLE_GEMFILE: 'Gemfile'
     SETUP_DB: "false"
   before_script:
     - !reference [.default-before_script, before_script]
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml
index bb11ece96ae287ec..65eb2de52110411d 100644
--- a/.gitlab/ci/qa.gitlab-ci.yml
+++ b/.gitlab/ci/qa.gitlab-ci.yml
@@ -7,6 +7,7 @@
   needs: []
   variables:
     USE_BUNDLE_INSTALL: "false"
+    BUNDLE_GEMFILE: 'Gemfile'
     SETUP_DB: "false"
   before_script:
     - !reference [.default-before_script, before_script]
diff --git a/spec/dot_gitlab_ci/rules_spec.rb b/spec/dot_gitlab_ci/rules_spec.rb
index d5892b5a42acbb4f..d5d5ea950ea15efe 100644
--- a/spec/dot_gitlab_ci/rules_spec.rb
+++ b/spec/dot_gitlab_ci/rules_spec.rb
@@ -228,6 +228,9 @@
         'ee/lib/ee/gitlab/background_migration/.rubocop.yml',
         'ee/LICENSE',
         'Gemfile.checksum',
+        'Gemfile.next',
+        'Gemfile.next.lock',
+        'Gemfile.next.checksum',
         'gems/error_tracking_open_api/.openapi-generator/FILES',
         'gems/error_tracking_open_api/.openapi-generator/VERSION',
         'gems/openbao_client/.openapi-generator/FILES',
-- 
GitLab