Commit eecf0200 authored by David Kim's avatar David Kim

Merge branch 'jivanvl-remove-ci-cross-pipeline-artifacts-download-ff' into 'master'

Enable cross pipeline artifacts download [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!63074
parents eca55e08 16da2f24
...@@ -143,8 +143,6 @@ module Ci ...@@ -143,8 +143,6 @@ module Ci
def specified_cross_pipeline_dependencies def specified_cross_pipeline_dependencies
strong_memoize(:specified_cross_pipeline_dependencies) do strong_memoize(:specified_cross_pipeline_dependencies) do
next [] unless Feature.enabled?(:ci_cross_pipeline_artifacts_download, processable.project, default_enabled: true)
specified_cross_dependencies.select { |dep| dep[:pipeline] && dep[:artifacts] } specified_cross_dependencies.select { |dep| dep[:pipeline] && dep[:artifacts] }
end end
end end
......
---
name: ci_cross_pipeline_artifacts_download
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48342
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/287622
milestone: '13.7'
type: development
group: group::continuous integration
default_enabled: true
...@@ -335,15 +335,6 @@ RSpec.describe Ci::BuildDependencies do ...@@ -335,15 +335,6 @@ RSpec.describe Ci::BuildDependencies do
it 'returns both dependencies' do it 'returns both dependencies' do
is_expected.to contain_exactly(cross_project_dependency, upstream_pipeline_dependency) is_expected.to contain_exactly(cross_project_dependency, upstream_pipeline_dependency)
end end
context 'when feature flag `ci_cross_pipeline_artifacts_download` is disabled' do
before do
stub_feature_flags(ci_cross_pipeline_artifacts_download: false)
end
it { is_expected.to contain_exactly(cross_project_dependency) }
it { expect(build_dependencies).to be_valid }
end
end end
end end
end end
...@@ -187,15 +187,6 @@ RSpec.describe Ci::BuildDependencies do ...@@ -187,15 +187,6 @@ RSpec.describe Ci::BuildDependencies do
it { expect(cross_pipeline_deps).to contain_exactly(upstream_job) } it { expect(cross_pipeline_deps).to contain_exactly(upstream_job) }
it { is_expected.to be_valid } it { is_expected.to be_valid }
end end
context 'when feature flag `ci_cross_pipeline_artifacts_download` is disabled' do
before do
stub_feature_flags(ci_cross_pipeline_artifacts_download: false)
end
it { expect(cross_pipeline_deps).to be_empty }
it { is_expected.to be_valid }
end
end end
context 'when same job names exist in other pipelines in the hierarchy' do context 'when same job names exist in other pipelines in the hierarchy' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment