Commit fe0f7e1a authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Merge branch 'remove-ff-ci_parent_child_pipeline' into 'master'

Remove FF ci_parent_child_pipeline

See merge request gitlab-org/gitlab!30601
parents c0058d1b 96f256b4
...@@ -25,8 +25,7 @@ module Gitlab ...@@ -25,8 +25,7 @@ module Gitlab
strategy :CrossProjectTrigger, if: -> (config) { !config.key?(:include) } strategy :CrossProjectTrigger, if: -> (config) { !config.key?(:include) }
strategy :SameProjectTrigger, if: -> (config) do strategy :SameProjectTrigger, if: -> (config) do
::Feature.enabled?(:ci_parent_child_pipeline, default_enabled: true) && config.key?(:include)
config.key?(:include)
end end
class CrossProjectTrigger < ::Gitlab::Config::Entry::Node class CrossProjectTrigger < ::Gitlab::Config::Entry::Node
...@@ -72,11 +71,7 @@ module Gitlab ...@@ -72,11 +71,7 @@ module Gitlab
class UnknownStrategy < ::Gitlab::Config::Entry::Node class UnknownStrategy < ::Gitlab::Config::Entry::Node
def errors def errors
if ::Feature.enabled?(:ci_parent_child_pipeline, default_enabled: true) ['config must specify either project or include']
['config must specify either project or include']
else
['config must specify project']
end
end end
end end
end end
......
...@@ -114,19 +114,6 @@ describe Gitlab::Ci::Config::Entry::Trigger do ...@@ -114,19 +114,6 @@ describe Gitlab::Ci::Config::Entry::Trigger do
.to match /config contains unknown keys: branch/ .to match /config contains unknown keys: branch/
end end
end end
context 'when feature flag is off' do
before do
stub_feature_flags(ci_parent_child_pipeline: false)
end
let(:config) { { include: 'path/to/config.yml' } }
it 'is returns an error if include is used' do
expect(subject.errors.first)
.to match /config must specify project/
end
end
end end
context 'when config contains unknown keys' do context 'when config contains unknown keys' 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