diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 13:37:47 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 13:37:47 +0000 |
commit | aee0a117a889461ce8ced6fcf73207fe017f1d99 (patch) | |
tree | 891d9ef189227a8445d83f35c1b0fc99573f4380 /app/services/ci/update_build_queue_service.rb | |
parent | 8d46af3258650d305f53b819eabf7ab18d22f59e (diff) | |
download | gitlab-ce-aee0a117a889461ce8ced6fcf73207fe017f1d99.tar.gz |
Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42
Diffstat (limited to 'app/services/ci/update_build_queue_service.rb')
-rw-r--r-- | app/services/ci/update_build_queue_service.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/services/ci/update_build_queue_service.rb b/app/services/ci/update_build_queue_service.rb index c1cbf031ca1..146239bb7e5 100644 --- a/app/services/ci/update_build_queue_service.rb +++ b/app/services/ci/update_build_queue_service.rb @@ -14,7 +14,7 @@ module Ci # Add a build to the pending builds queue # def push(build, transition) - return unless maintain_pending_builds_queue?(build) + return unless maintain_pending_builds_queue? raise InvalidQueueTransition unless transition.to == 'pending' @@ -33,7 +33,7 @@ module Ci # Remove a build from the pending builds queue # def pop(build, transition) - return unless maintain_pending_builds_queue?(build) + return unless maintain_pending_builds_queue? raise InvalidQueueTransition unless transition.from == 'pending' @@ -52,7 +52,7 @@ module Ci # Add shared runner build tracking entry (used for queuing). # def track(build, transition) - return unless Feature.enabled?(:ci_track_shared_runner_builds, build.project, default_enabled: :yaml) + return unless maintain_pending_builds_queue? return unless build.shared_runner_build? raise InvalidQueueTransition unless transition.to == 'running' @@ -73,7 +73,7 @@ module Ci # queuing). # def untrack(build, transition) - return unless Feature.enabled?(:ci_untrack_shared_runner_builds, build.project, default_enabled: :yaml) + return unless maintain_pending_builds_queue? return unless build.shared_runner_build? raise InvalidQueueTransition unless transition.from == 'running' @@ -113,8 +113,8 @@ module Ci end end - def maintain_pending_builds_queue?(build) - Feature.enabled?(:ci_pending_builds_queue_maintain, build.project, default_enabled: :yaml) + def maintain_pending_builds_queue? + ::Ci::PendingBuild.maintain_denormalized_data? end end end |