Commit 29d896f9 authored by Kamil Trzcinski's avatar Kamil Trzcinski

Add feature flag to disable shared runner build minutes limit

parent 14813d1f
...@@ -13,7 +13,11 @@ module Ci ...@@ -13,7 +13,11 @@ module Ci
def execute def execute
builds = builds =
if runner.shared? if runner.shared?
builds_for_shared_runner if ENV['DISABLE_SHARED_RUNNER_BUILD_MINTUES_LIMIT'].to_s == 'true'
builds_for_shared_runner
else
builds_for_sharer_runner_with_build_minutes_check
end
else else
builds_for_specific_runner builds_for_specific_runner
end end
...@@ -37,6 +41,13 @@ module Ci ...@@ -37,6 +41,13 @@ module Ci
private private
def builds_for_sharer_runner_with_build_minutes_check
# select projects which have allowed number of shared runner minutes or are public
builds_for_shared_runner.
where("projects.visibility_level=? OR (#{builds_check_limit.to_sql})=1",
Gitlab::VisibilityLevel::PUBLIC).
end
def builds_for_shared_runner def builds_for_shared_runner
new_builds. new_builds.
# don't run projects which have not enabled shared runners and builds # don't run projects which have not enabled shared runners and builds
...@@ -44,10 +55,6 @@ module Ci ...@@ -44,10 +55,6 @@ module Ci
joins('LEFT JOIN project_features ON ci_builds.gl_project_id = project_features.project_id'). joins('LEFT JOIN project_features ON ci_builds.gl_project_id = project_features.project_id').
where('project_features.builds_access_level IS NULL or project_features.builds_access_level > 0'). where('project_features.builds_access_level IS NULL or project_features.builds_access_level > 0').
# select projects which have allowed number of shared runner minutes or are public
where("projects.visibility_level=? OR (#{builds_check_limit.to_sql})=1",
Gitlab::VisibilityLevel::PUBLIC).
# Implement fair scheduling # Implement fair scheduling
# this returns builds that are ordered by number of running builds # this returns builds that are ordered by number of running builds
# we prefer projects that don't use shared runners at all # we prefer projects that don't use shared runners at all
......
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