Merge branch 'lm-clean-up-ff' into 'master'

Removes ci_same_stage_job_needs ff

See merge request gitlab-org/gitlab!68041

app/services/ci/after_requeue_job_service.rb

@@ -10,16 +10,9 @@ module Ci
     private
 
     def process_subsequent_jobs(processable)
-      if Feature.enabled?(:ci_same_stage_job_needs, processable.project, default_enabled: :yaml)
-        (stage_dependent_jobs(processable) | needs_dependent_jobs(processable))
-        .each do |processable|
-          process(processable)
-        end
-      else
-        skipped_jobs(processable).after_stage(processable.stage_idx)
-          .find_each do |job|
-          process(job)
-        end
+      (stage_dependent_jobs(processable) | needs_dependent_jobs(processable))
+      .each do |processable|
+        process(processable)
       end
     end
 

config/feature_flags/development/ci_same_stage_job_needs.yml

----
-name: ci_same_stage_job_needs
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59668
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/328253
-milestone: '14.1'
-type: development
-group: group::pipeline authoring
-default_enabled: true

doc/ci/yaml/index.md

@@ -1594,8 +1594,7 @@ production:
 - In [GitLab 14.1 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/30632) you
   can refer to jobs in the same stage as the job you are configuring. This feature is
   enabled on GitLab.com and ready for production use. On self-managed [GitLab 14.2 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/30632)
-  this feature is available by default. To hide the feature, ask an administrator to
-  [disable the `ci_same_stage_job_needs` flag](../../administration/feature_flags.md).
+  this feature is available by default.
 - In GitLab 14.0 and older, you can only refer to jobs in earlier stages.
 - In GitLab 13.9 and older, if `needs:` refers to a job that might not be added to
   a pipeline because of `only`, `except`, or `rules`, the pipeline might fail to create.

lib/gitlab/ci/pipeline/seed/build.rb

@@ -15,12 +15,7 @@ module Gitlab
             @context = context
             @pipeline = context.pipeline
             @seed_attributes = attributes
-            @stages_for_needs_lookup = if Feature.enabled?(:ci_same_stage_job_needs, @pipeline.project, default_enabled: :yaml)
-                                         (previous_stages + [current_stage]).compact
-                                       else
-                                         previous_stages
-                                       end
-
+            @stages_for_needs_lookup = (previous_stages + [current_stage]).compact
             @needs_attributes = dig(:needs_attributes)
             @resource_group_key = attributes.delete(:resource_group_key)
             @job_variables = @seed_attributes.delete(:job_variables)

lib/gitlab/ci/yaml_processor.rb

@@ -47,9 +47,7 @@ module Gitlab
           validate_job!(name, job)
         end
 
-        if ::Feature.enabled?(:ci_same_stage_job_needs, @opts[:project], default_enabled: :yaml)
-          YamlProcessor::Dag.check_circular_dependencies!(@jobs)
-        end
+        YamlProcessor::Dag.check_circular_dependencies!(@jobs)
       end
 
       def validate_job!(name, job)
@@ -103,16 +101,8 @@ module Gitlab
         job_stage_index = stage_index(name)
         dependency_stage_index = stage_index(dependency)
 
-        if ::Feature.enabled?(:ci_same_stage_job_needs, @opts[:project], default_enabled: :yaml)
-          unless dependency_stage_index.present? && dependency_stage_index <= job_stage_index
-            error!("#{name} job: #{dependency_type} #{dependency} is not defined in current or prior stages")
-          end
-        else
-          # A dependency might be defined later in the configuration
-          # with a stage that does not exist
-          unless dependency_stage_index.present? && dependency_stage_index < job_stage_index
-            error!("#{name} job: #{dependency_type} #{dependency} is not defined in prior stages")
-          end
+        unless dependency_stage_index.present? && dependency_stage_index <= job_stage_index
+          error!("#{name} job: #{dependency_type} #{dependency} is not defined in current or prior stages")
         end
       end
 

spec/lib/gitlab/ci/pipeline/seed/build_spec.rb

@@ -1140,16 +1140,6 @@ RSpec.describe Gitlab::Ci::Pipeline::Seed::Build do
       it 'does not have errors' do
         expect(subject.errors).to be_empty
       end
-
-      context 'when ci_same_stage_job_needs FF is disabled' do
-        before do
-          stub_feature_flags(ci_same_stage_job_needs: false)
-        end
-
-        it 'has errors' do
-          expect(subject.errors).to contain_exactly("'rspec' job needs 'build' job, but 'build' is not in any previous stage")
-        end
-      end
     end
 
     context 'when using 101 needs' do

spec/lib/gitlab/ci/pipeline/seed/pipeline_spec.rb

@@ -34,10 +34,6 @@ RSpec.describe Gitlab::Ci::Pipeline::Seed::Pipeline do
     described_class.new(seed_context, stages_attributes)
   end
 
-  before do
-    stub_feature_flags(ci_same_stage_job_needs: false)
-  end
-
   describe '#stages' do
     it 'returns the stage resources' do
       stages = seed.stages

spec/lib/gitlab/ci/yaml_processor_spec.rb

@@ -590,14 +590,6 @@ module Gitlab
             end
 
             it_behaves_like 'has warnings and expected error', /build job: need test is not defined in current or prior stages/
-
-            context 'with ci_same_stage_job_needs FF disabled' do
-              before do
-                stub_feature_flags(ci_same_stage_job_needs: false)
-              end
-
-              it_behaves_like 'has warnings and expected error', /build job: need test is not defined in prior stages/
-            end
           end
         end
       end
@@ -1809,14 +1801,6 @@ module Gitlab
           let(:dependencies) { ['deploy'] }
 
           it_behaves_like 'returns errors', 'test1 job: dependency deploy is not defined in current or prior stages'
-
-          context 'with ci_same_stage_job_needs FF disabled' do
-            before do
-              stub_feature_flags(ci_same_stage_job_needs: false)
-            end
-
-            it_behaves_like 'returns errors', 'test1 job: dependency deploy is not defined in prior stages'
-          end
         end
 
         context 'when a job depends on another job that references a not-yet defined stage' do
@@ -2053,14 +2037,6 @@ module Gitlab
           let(:needs) { ['deploy'] }
 
           it_behaves_like 'returns errors', 'test1 job: need deploy is not defined in current or prior stages'
-
-          context 'with ci_same_stage_job_needs FF disabled' do
-            before do
-              stub_feature_flags(ci_same_stage_job_needs: false)
-            end
-
-            it_behaves_like 'returns errors', 'test1 job: need deploy is not defined in prior stages'
-          end
         end
 
         context 'needs and dependencies that are mismatching' do

spec/services/ci/after_requeue_job_service_spec.rb

@@ -44,16 +44,6 @@ RSpec.describe Ci::AfterRequeueJobService do
     it 'marks subsequent skipped jobs as processable' do
       expect { execute_service }.to change { test4.reload.status }.from('skipped').to('created')
     end
-
-    context 'with ci_same_stage_job_needs FF disabled' do
-      before do
-        stub_feature_flags(ci_same_stage_job_needs: false)
-      end
-
-      it 'does nothing with the build' do
-        expect { execute_service }.not_to change { test4.reload.status }
-      end
-    end
   end
 
   context 'when the pipeline is a downstream pipeline and the bridge is depended' do