Merge branch '40186-the-ee_compat_check-job-sometimes-fail-on-the-git-apply-3way-step-for-forks' into 'master'

Always fetch master from the canonical remote

Closes #40186

See merge request gitlab-org/gitlab-ce!15399

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/gitlab/ee_compat_check.rb b/lib/gitlab/ee_compat_check.rb
index 0ea534a5fd0..efc2e46d289 100644
--- a/lib/gitlab/ee_compat_check.rb
+++ b/lib/gitlab/ee_compat_check.rb
@@ -193,7 +193,7 @@ module Gitlab
           # Repository is initially cloned with a depth of 20 so we need to fetch
           # deeper in the case the branch has more than 20 commits on top of master
           fetch(branch: branch, depth: depth)
-          fetch(branch: 'master', depth: depth)
+          fetch(branch: 'master', depth: depth, remote: DEFAULT_CE_PROJECT_URL)
 
           merge_base_found?
         end
@@ -201,10 +201,10 @@ module Gitlab
       raise "\n#{branch} is too far behind master, please rebase it!\n" unless success
     end
 
-    def fetch(branch:, depth:)
+    def fetch(branch:, depth:, remote: 'origin')
       step(
         "Fetching deeper...",
-        %W[git fetch --depth=#{depth} --prune origin +refs/heads/#{branch}:refs/remotes/origin/#{branch}]
+        %W[git fetch --depth=#{depth} --prune #{remote} +refs/heads/#{branch}:refs/remotes/origin/#{branch}]
       ) do |output, status|
         raise "Fetch failed: #{output}" unless status.zero?
       end