Merge branch '321972-remove-ci_fix_pipeline_status_for_dag_needs_manual' into 'master'

Remove FF ci_fix_pipeline_status_for_dag_needs_manual

See merge request gitlab-org/gitlab!64777

app/services/ci/play_bridge_service.rb

@@ -9,8 +9,6 @@ module Ci
         bridge.user = current_user
         bridge.enqueue!
 
-        next unless ::Feature.enabled?(:ci_fix_pipeline_status_for_dag_needs_manual, project, default_enabled: :yaml)
-
         AfterRequeueJobService.new(project, current_user).execute(bridge)
       end
     end

app/services/ci/play_build_service.rb

@@ -11,8 +11,6 @@ module Ci
         build.tap do |build|
           build.update(user: current_user, job_variables_attributes: job_variables_attributes || [])
 
-          next unless ::Feature.enabled?(:ci_fix_pipeline_status_for_dag_needs_manual, project, default_enabled: :yaml)
-
           AfterRequeueJobService.new(project, current_user).execute(build)
         end
       else

config/feature_flags/development/ci_fix_pipeline_status_for_dag_needs_manual.yml

----
-name: ci_fix_pipeline_status_for_dag_needs_manual
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53476
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321972
-milestone: '13.10'
-type: development
-group: group::pipeline authoring
-default_enabled: true

lib/gitlab/ci/status/composite.rb

@@ -95,11 +95,7 @@ module Gitlab
         end
 
         def any_skipped_or_ignored?
-          if ::Feature.enabled?(:ci_fix_pipeline_status_for_dag_needs_manual, @project, default_enabled: :yaml)
-            any_of?(:skipped) || any_of?(:ignored)
-          else
-            any_of?(:skipped)
-          end
+          any_of?(:skipped) || any_of?(:ignored)
         end
 
         def consume_all_statuses(all_statuses)

spec/lib/gitlab/ci/status/composite_spec.rb

@@ -82,25 +82,6 @@ RSpec.describe Gitlab::Ci::Status::Composite do
 
         it_behaves_like 'compares status and warnings'
       end
-
-      context 'when FF ci_fix_pipeline_status_for_dag_needs_manual is disabled' do
-        before do
-          stub_feature_flags(ci_fix_pipeline_status_for_dag_needs_manual: false)
-        end
-
-        where(:build_statuses, :dag, :result, :has_warnings) do
-          %i(success manual) | true  | 'pending' | false
-          %i(success manual) | false | 'success' | false
-        end
-
-        with_them do
-          let(:all_statuses) do
-            build_statuses.map { |status| @statuses_with_allow_failure[status] }
-          end
-
-          it_behaves_like 'compares status and warnings'
-        end
-      end
     end
   end
 end

spec/services/ci/pipeline_processing/shared_processing_service.rb

@@ -842,20 +842,6 @@ RSpec.shared_examples 'Pipeline Processing Service' do
       expect(all_builds.manual).to contain_exactly(linux_build)
       expect(all_builds.skipped).to contain_exactly(deploy)
     end
-
-    context 'when FF ci_fix_pipeline_status_for_dag_needs_manual is disabled' do
-      before do
-        stub_feature_flags(ci_fix_pipeline_status_for_dag_needs_manual: false)
-      end
-
-      it 'makes deploy DAG to be waiting for optional manual to finish' do
-        expect(process_pipeline).to be_truthy
-
-        expect(stages).to eq(%w(skipped created))
-        expect(all_builds.manual).to contain_exactly(linux_build)
-        expect(all_builds.created).to contain_exactly(deploy)
-      end
-    end
   end
 
   context 'when a bridge job has parallel:matrix config', :sidekiq_inline do

spec/services/ci/play_bridge_service_spec.rb

@@ -45,16 +45,6 @@ RSpec.describe Ci::PlayBridgeService, '#execute' do
       it 'marks the subsequent job as processable' do
         expect { execute_service }.to change { job.reload.status }.from('skipped').to('created')
       end
-
-      context 'when the FF ci_fix_pipeline_status_for_dag_needs_manual is disabled' do
-        before do
-          stub_feature_flags(ci_fix_pipeline_status_for_dag_needs_manual: false)
-        end
-
-        it 'does not change the subsequent job' do
-          expect { execute_service }.not_to change { job.reload.status }.from('skipped')
-        end
-      end
     end
 
     context 'when bridge is not playable' do

spec/services/ci/play_build_service_spec.rb

@@ -71,16 +71,6 @@ RSpec.describe Ci::PlayBuildService, '#execute' do
       it 'marks the subsequent job as processable' do
         expect { service.execute(build) }.to change { job.reload.status }.from('skipped').to('created')
       end
-
-      context 'when the FF ci_fix_pipeline_status_for_dag_needs_manual is disabled' do
-        before do
-          stub_feature_flags(ci_fix_pipeline_status_for_dag_needs_manual: false)
-        end
-
-        it 'does not change the subsequent job' do
-          expect { service.execute(build) }.not_to change { job.reload.status }.from('skipped')
-        end
-      end
     end
 
     context 'when variables are supplied' do