Merge branch '8259-ruby-3.1-feature-branch-builds' into 'master'

Switch feature branch builds to Ruby 3.1.4

Closes #8259

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7254

Merged-by: Robert Marshall <[email protected]>
Approved-by: Hossein Pursultani <[email protected]>
Co-authored-by: Balasankar "Balu" C <[email protected]>

Author: Robert Marshall

.gitlab-ci.yml

@@ -64,7 +64,7 @@ variables:
   BUNDLER_VERSION: "2.4.13"
   # NOTE: When `NEXT_RUBY_VERSION` is updated, flip
   # `USE_NEXT_RUBY_VERSION_IN_*` variables to false to avoid surprises.
-  NEXT_RUBY_VERSION: "3.0.6"
+  NEXT_RUBY_VERSION: "3.1.4"
   GET_GEO_TAG: "0.7.3"
   CANONICAL_PROJECT_PATH: 'gitlab-org/omnibus-gitlab'
   SECURITY_PROJECT_PATH: 'gitlab-org/security/omnibus-gitlab'

lib/gitlab/build/info/ci.rb

@@ -7,7 +7,7 @@ class Info
     class CI
       class << self
         def branch_name
-          Gitlab::Util.get_env('CI_COMMIT_BRANCH')
+          Gitlab::Util.get_env('CI_COMMIT_BRANCH') || Gitlab::Util.get_env('CI_MERGE_REQUEST_SOURCE_BRANCH_NAME')
         end
 
         def tag_name

spec/lib/gitlab/build/check_spec.rb

@@ -269,6 +269,16 @@
       end
     end
 
+    context 'when on a feature branch MR pipeline' do
+      before do
+        stub_mr_branch('my-feature-branch')
+      end
+
+      it 'returns true' do
+        expect(described_class.on_regular_branch?).to be_truthy
+      end
+    end
+
     context 'when on a stable branch' do
       before do
         stub_branch('15-6-stable')

spec/lib/gitlab/build/info/git_spec.rb

@@ -26,6 +26,7 @@
       context 'not in CI' do
         before do
           stub_env_var('CI_COMMIT_BRANCH', '')
+          stub_env_var('CI_MERGE_REQUEST_SOURCE_BRANCH_NAME', '')
           allow(Gitlab::Util).to receive(:shellout_stdout).with('git rev-parse --abbrev-ref HEAD').and_return('HEAD')
         end
 
@@ -37,19 +38,34 @@
 
     context 'in branches' do
       context 'in CI' do
-        before do
-          stub_env_var('CI_COMMIT_BRANCH', 'my-feature-branch')
+        context 'in MR pipelines' do
+          before do
+            stub_env_var('CI_COMMIT_BRANCH', '')
+            stub_env_var('CI_MERGE_REQUEST_SOURCE_BRANCH_NAME', 'my-feature-branch')
+          end
+
+          it 'returns branch name from CI variable' do
+            expect(described_class.branch_name).to eq('my-feature-branch')
+          end
         end
 
-        it 'returns branch name from CI variable' do
-          expect(described_class.branch_name).to eq('my-feature-branch')
+        context 'in regular branch pipelines' do
+          before do
+            stub_env_var('CI_COMMIT_BRANCH', 'my-feature-branch')
+            stub_env_var('CI_MERGE_REQUEST_SOURCE_BRANCH_NAME', '')
+          end
+
+          it 'returns branch name from CI variable' do
+            expect(described_class.branch_name).to eq('my-feature-branch')
+          end
         end
       end
 
       context 'not in CI' do
         before do
           stub_env_var('CI_COMMIT_BRANCH', '')
           stub_env_var('CI_COMMIT_TAG', '')
+          stub_env_var('CI_MERGE_REQUEST_SOURCE_BRANCH_NAME', '')
           allow(Gitlab::Util).to receive(:shellout_stdout).with('git rev-parse --abbrev-ref HEAD').and_return('my-feature-branch')
         end
 

spec/support/macros.rb

@@ -52,11 +52,23 @@ def stub_env_var(var, value)
     end
 
     def stub_branch(branch)
+      stub_env_var('CI_MERGE_REQUEST_SOURCE_BRANCH_NAME', '')
+
       stub_env_var('CI_COMMIT_BRANCH', branch)
       allow(Gitlab::Util).to receive(:shellout_stdout).with('git rev-parse --abbrev-ref HEAD').and_return(branch)
 
       stub_env_var('CI_COMMIT_TAG', '')
-      allow(Gitlab::Util).to receive(:shellout_stdout).with('git describe --tags --exact-match').and_raise(Gitlab::Util::ShellOutExecutionError.new("git describe --tags --exact-match", 128, "", "fatal: no tag exactly matches 'foobar'"))
+      allow(Gitlab::Util).to receive(:shellout_stdout).with('git describe --tags --exact-match').and_raise(Gitlab::Util::ShellOutExecutionError.new("git describe --tags --exact-match", 128, "", "fatal: no tag exactly matches '#{branch}'"))
+    end
+
+    def stub_mr_branch(branch)
+      stub_env_var('CI_MERGE_REQUEST_SOURCE_BRANCH_NAME', branch)
+
+      stub_env_var('CI_COMMIT_BRANCH', '')
+      allow(Gitlab::Util).to receive(:shellout_stdout).with('git rev-parse --abbrev-ref HEAD').and_return('HEAD')
+
+      stub_env_var('CI_COMMIT_TAG', '')
+      allow(Gitlab::Util).to receive(:shellout_stdout).with('git describe --tags --exact-match').and_raise(Gitlab::Util::ShellOutExecutionError.new("git describe --tags --exact-match", 128, "", "fatal: no tag exactly matches '#{branch}'"))
     end
 
     def stub_tag(tag)
@@ -65,6 +77,8 @@ def stub_tag(tag)
 
       stub_env_var('CI_COMMIT_BRANCH', '')
       allow(Gitlab::Util).to receive(:shellout_stdout).with('git rev-parse --abbrev-ref HEAD').and_return('HEAD')
+
+      stub_env_var('CI_MERGE_REQUEST_SOURCE_BRANCH_NAME', '')
     end
 
     def stub_is_package_version(package, value = nil)