diff --git a/config/feature_flags/development/ci_simplify_dag_status_calculation_for_processing.yml b/config/feature_flags/development/ci_simplify_dag_status_calculation_for_processing.yml deleted file mode 100644 index bde5bce548fcc73b65050ca470080899de19fffd..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/ci_simplify_dag_status_calculation_for_processing.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: ci_simplify_dag_status_calculation_for_processing -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115684 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/403005 -milestone: '15.11' -type: development -group: group::pipeline authoring -default_enabled: false diff --git a/lib/gitlab/ci/status/composite.rb b/lib/gitlab/ci/status/composite.rb index 8e55b41436482c4d92445651b8cc8bafd751e34c..1ba78b357e53de84f344c85ac8492b8e19ef6327 100644 --- a/lib/gitlab/ci/status/composite.rb +++ b/lib/gitlab/ci/status/composite.rb @@ -45,11 +45,6 @@ def status if @dag && any_skipped_or_ignored? # The DAG job is skipped if one of the needs does not run at all. 'skipped' - elsif ::Feature.disabled?(:ci_simplify_dag_status_calculation_for_processing, @project) && - @dag && - !only_of?(:success, :failed, :canceled, :skipped, :success_with_warnings) - # DAG is blocked from executing if a dependent is not "complete" - 'pending' elsif only_of?(:skipped, :ignored) 'skipped' elsif only_of?(:success, :skipped, :success_with_warnings, :ignored) diff --git a/spec/services/ci/pipeline_processing/atomic_processing_service_spec.rb b/spec/services/ci/pipeline_processing/atomic_processing_service_spec.rb index d59d8e24af691fd40ed88bb37060f9afa7cccf32..d0496acc6fea9a0a1746f9a999b8008af2cfc32c 100644 --- a/spec/services/ci/pipeline_processing/atomic_processing_service_spec.rb +++ b/spec/services/ci/pipeline_processing/atomic_processing_service_spec.rb @@ -33,25 +33,6 @@ end end - context 'when the FF ci_simplify_dag_status_calculation_for_processing is disabled' do - before do - stub_feature_flags(ci_simplify_dag_status_calculation_for_processing: false) - end - - # This is duplicate of the one above but it is temporary - it 'follows transitions' do - expect(pipeline).to be_persisted - Sidekiq::Worker.drain_all # ensure that all async jobs are executed - check_expectation(test_file.dig('init', 'expect'), "init") - - test_file['transitions'].each_with_index do |transition, idx| - process_events(transition) - Sidekiq::Worker.drain_all # ensure that all async jobs are executed - check_expectation(transition['expect'], "transition:#{idx}") - end - end - end - private def check_expectation(expectation, message)