Merge branch 'lm-follow-up' into 'master'

Removes FF and condition

See merge request gitlab-org/gitlab!36140

app/models/ci/pipeline.rb

@@ -1008,8 +1008,6 @@ module Ci
     # Set scheduling type of processables if they were created before scheduling_type
     # data was deployed (https://gitlab.com/gitlab-org/gitlab/-/merge_requests/22246).
     def ensure_scheduling_type!
-      return unless ::Gitlab::Ci::Features.ensure_scheduling_type_enabled?
-
       processables.populate_scheduling_type!
     end
 

app/services/ci/retry_build_service.rb

@@ -34,10 +34,6 @@ module Ci
 
       attributes[:user] = current_user
 
-      # TODO: we can probably remove this logic
-      # see: https://gitlab.com/gitlab-org/gitlab/-/issues/217930
-      attributes[:scheduling_type] ||= build.find_legacy_scheduling_type
-
       Ci::Build.transaction do
         # mark all other builds of that name as retried
         build.pipeline.builds.latest

changelogs/unreleased/lm-follow-up.yml

+---
+title: Removes ci_ensure_scheduling_type feature flag
+merge_request: 36140
+author:
+type: other

lib/gitlab/ci/features.rb

@@ -10,10 +10,6 @@ module Gitlab
         ::Feature.enabled?(:ci_artifacts_exclude, default_enabled: true)
       end
 
-      def self.ensure_scheduling_type_enabled?
-        ::Feature.enabled?(:ci_ensure_scheduling_type, default_enabled: true)
-      end
-
       def self.job_heartbeats_runner?(project)
         ::Feature.enabled?(:ci_job_heartbeats_runner, project, default_enabled: true)
       end

spec/services/ci/retry_build_service_spec.rb

@@ -278,28 +278,6 @@ RSpec.describe Ci::RetryBuildService do
           expect(new_build.metadata.expanded_environment_name).to eq('production')
         end
       end
-
-      context 'when scheduling_type of build is nil' do
-        before do
-          build.update_columns(scheduling_type: nil)
-        end
-
-        context 'when build has not needs' do
-          it 'sets scheduling_type as :stage' do
-            expect(new_build.scheduling_type).to eq('stage')
-          end
-        end
-
-        context 'when build has needs' do
-          before do
-            create(:ci_build_need, build: build)
-          end
-
-          it 'sets scheduling_type as :dag' do
-            expect(new_build.scheduling_type).to eq('dag')
-          end
-        end
-      end
     end
 
     context 'when user does not have ability to execute build' do