Revert a default GIT_DEPTH for MR pipeline
This commit is contained in:
parent
12aff0b73c
commit
dbd6223211
|
@ -4,7 +4,6 @@ module Ci
|
|||
class BuildRunnerPresenter < SimpleDelegator
|
||||
include Gitlab::Utils::StrongMemoize
|
||||
|
||||
DEFAULT_GIT_DEPTH_MERGE_REQUEST = 10
|
||||
RUNNER_REMOTE_TAG_PREFIX = 'refs/tags/'.freeze
|
||||
RUNNER_REMOTE_BRANCH_PREFIX = 'refs/remotes/origin/'.freeze
|
||||
|
||||
|
@ -28,7 +27,6 @@ module Ci
|
|||
def git_depth
|
||||
strong_memoize(:git_depth) do
|
||||
git_depth = variables&.find { |variable| variable[:key] == 'GIT_DEPTH' }&.dig(:value)
|
||||
git_depth ||= DEFAULT_GIT_DEPTH_MERGE_REQUEST if merge_request_ref?
|
||||
git_depth.to_i
|
||||
end
|
||||
end
|
||||
|
@ -39,12 +37,13 @@ module Ci
|
|||
if git_depth > 0
|
||||
specs << refspec_for_branch(ref) if branch? || legacy_detached_merge_request_pipeline?
|
||||
specs << refspec_for_tag(ref) if tag?
|
||||
specs << refspec_for_merge_request_ref if merge_request_ref?
|
||||
else
|
||||
specs << refspec_for_branch
|
||||
specs << refspec_for_tag
|
||||
end
|
||||
|
||||
specs << refspec_for_merge_request_ref if merge_request_ref?
|
||||
|
||||
specs
|
||||
end
|
||||
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Remove a default git depth in Pipelines for merge requests
|
||||
merge_request: 28926
|
||||
author:
|
||||
type: fixed
|
|
@ -136,24 +136,6 @@ describe Ci::BuildRunnerPresenter do
|
|||
is_expected.to eq(1)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when pipeline is detached merge request pipeline' do
|
||||
let(:merge_request) { create(:merge_request, :with_detached_merge_request_pipeline) }
|
||||
let(:pipeline) { merge_request.all_pipelines.first }
|
||||
let(:build) { create(:ci_build, ref: pipeline.ref, pipeline: pipeline) }
|
||||
|
||||
it 'returns the default git depth for pipelines for merge requests' do
|
||||
is_expected.to eq(described_class::DEFAULT_GIT_DEPTH_MERGE_REQUEST)
|
||||
end
|
||||
|
||||
context 'when pipeline is legacy detached merge request pipeline' do
|
||||
let(:merge_request) { create(:merge_request, :with_legacy_detached_merge_request_pipeline) }
|
||||
|
||||
it 'behaves as branch pipeline' do
|
||||
is_expected.to eq(0)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe '#refspecs' do
|
||||
|
@ -191,7 +173,9 @@ describe Ci::BuildRunnerPresenter do
|
|||
|
||||
it 'returns the correct refspecs' do
|
||||
is_expected
|
||||
.to contain_exactly('+refs/merge-requests/1/head:refs/merge-requests/1/head')
|
||||
.to contain_exactly('+refs/heads/*:refs/remotes/origin/*',
|
||||
'+refs/tags/*:refs/tags/*',
|
||||
'+refs/merge-requests/1/head:refs/merge-requests/1/head')
|
||||
end
|
||||
|
||||
context 'when pipeline is legacy detached merge request pipeline' do
|
||||
|
|
Loading…
Reference in New Issue