Merge branch '337507-remove-ci_include_rules' into 'master'

Remove the FF ci_include_rules

See merge request gitlab-org/gitlab!72122

config/feature_flags/development/ci_include_rules.yml

----
-name: ci_include_rules
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67409
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337507
-milestone: '14.2'
-type: development
-group: group::pipeline authoring
-default_enabled: true

doc/ci/yaml/index.md

@@ -446,12 +446,11 @@ that proposes expanding this feature to support more variables.
 
 #### `rules` with `include`
 
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/276515) in GitLab 14.2.
-> - [Enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/337507) in GitLab 14.3 and is ready for production use.
-> - [Enabled with `ci_include_rules` flag](https://gitlab.com/gitlab-org/gitlab/-/issues/337507) for self-managed GitLab in GitLab 14.3 and is ready for production use.
-
-FLAG:
-On self-managed GitLab, by default this feature is available. To hide the feature per project or for your entire instance, ask an administrator to [disable the `ci_include_rules` flag](../../administration/feature_flags.md). On GitLab.com, this feature is available.
+> - Introduced in GitLab 14.2 [with a flag](../../administration/feature_flags.md) named `ci_include_rules`. Disabled by default.
+> - [Enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/337507) in GitLab 14.3.
+> - [Enabled on self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/337507) GitLab 14.3.
+> - [Feature flag `ci_include_rules` removed](https://gitlab.com/gitlab-org/gitlab/-/issues/337507) in GitLab 14.4.
+> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/337507) in GitLab 14.4.
 
 You can use [`rules`](#rules) with `include` to conditionally include other configuration files.
 You can only use [`if` rules](#rulesif) in `include`, and only with [certain variables](#variables-with-include).

lib/gitlab/ci/config/external/mapper.rb

@@ -58,9 +58,6 @@ module Gitlab
           end
 
           def verify_rules(location)
-            # Behaves like there is no `rules`
-            return location unless ::Feature.enabled?(:ci_include_rules, context.project, default_enabled: :yaml)
-
             return unless Rules.new(location[:rules]).evaluate(context).pass?
 
             location

spec/lib/gitlab/ci/config/external/mapper_spec.rb

@@ -363,17 +363,6 @@ RSpec.describe Gitlab::Ci::Config::External::Mapper do
           expect(subject).to contain_exactly(an_instance_of(Gitlab::Ci::Config::External::File::Remote),
                                              an_instance_of(Gitlab::Ci::Config::External::File::Local))
         end
-
-        context 'when the FF ci_include_rules is disabled' do
-          before do
-            stub_feature_flags(ci_include_rules: false)
-          end
-
-          it 'includes the file' do
-            expect(subject).to contain_exactly(an_instance_of(Gitlab::Ci::Config::External::File::Remote),
-                                               an_instance_of(Gitlab::Ci::Config::External::File::Local))
-          end
-        end
       end
 
       context 'when the rules does not match' do
@@ -382,17 +371,6 @@ RSpec.describe Gitlab::Ci::Config::External::Mapper do
         it 'does not include the file' do
           expect(subject).to contain_exactly(an_instance_of(Gitlab::Ci::Config::External::File::Remote))
         end
-
-        context 'when the FF ci_include_rules is disabled' do
-          before do
-            stub_feature_flags(ci_include_rules: false)
-          end
-
-          it 'includes the file' do
-            expect(subject).to contain_exactly(an_instance_of(Gitlab::Ci::Config::External::File::Remote),
-                                               an_instance_of(Gitlab::Ci::Config::External::File::Local))
-          end
-        end
       end
     end
   end

spec/services/ci/create_pipeline_service/include_spec.rb

@@ -58,17 +58,6 @@ RSpec.describe Ci::CreatePipelineService do
           expect(pipeline).to be_created_successfully
           expect(pipeline.processables.pluck(:name)).to contain_exactly('job', 'rspec')
         end
-
-        context 'when the FF ci_include_rules is disabled' do
-          before do
-            stub_feature_flags(ci_include_rules: false)
-          end
-
-          it 'includes the job in the file' do
-            expect(pipeline).to be_created_successfully
-            expect(pipeline.processables.pluck(:name)).to contain_exactly('job', 'rspec')
-          end
-        end
       end
 
       context 'when the rules does not match' do
@@ -78,17 +67,6 @@ RSpec.describe Ci::CreatePipelineService do
           expect(pipeline).to be_created_successfully
           expect(pipeline.processables.pluck(:name)).to contain_exactly('job')
         end
-
-        context 'when the FF ci_include_rules is disabled' do
-          before do
-            stub_feature_flags(ci_include_rules: false)
-          end
-
-          it 'includes the job in the file' do
-            expect(pipeline).to be_created_successfully
-            expect(pipeline.processables.pluck(:name)).to contain_exactly('job', 'rspec')
-          end
-        end
       end
     end
   end