Commit 09e08e54 authored by lauraMon's avatar lauraMon

Removes FF and condition

parent 96edc891
...@@ -1004,8 +1004,6 @@ module Ci ...@@ -1004,8 +1004,6 @@ module Ci
# Set scheduling type of processables if they were created before scheduling_type # Set scheduling type of processables if they were created before scheduling_type
# data was deployed (https://gitlab.com/gitlab-org/gitlab/-/merge_requests/22246). # data was deployed (https://gitlab.com/gitlab-org/gitlab/-/merge_requests/22246).
def ensure_scheduling_type! def ensure_scheduling_type!
return unless ::Gitlab::Ci::Features.ensure_scheduling_type_enabled?
processables.populate_scheduling_type! processables.populate_scheduling_type!
end end
......
...@@ -34,10 +34,6 @@ module Ci ...@@ -34,10 +34,6 @@ module Ci
attributes[:user] = current_user 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 Ci::Build.transaction do
# mark all other builds of that name as retried # mark all other builds of that name as retried
build.pipeline.builds.latest build.pipeline.builds.latest
......
...@@ -10,10 +10,6 @@ module Gitlab ...@@ -10,10 +10,6 @@ module Gitlab
::Feature.enabled?(:ci_artifacts_exclude, default_enabled: true) ::Feature.enabled?(:ci_artifacts_exclude, default_enabled: true)
end end
def self.ensure_scheduling_type_enabled?
::Feature.enabled?(:ci_ensure_scheduling_type, default_enabled: true)
end
def self.job_heartbeats_runner?(project) def self.job_heartbeats_runner?(project)
::Feature.enabled?(:ci_job_heartbeats_runner, project, default_enabled: true) ::Feature.enabled?(:ci_job_heartbeats_runner, project, default_enabled: true)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment