1 files changed, 10 insertions, 0 deletions
diff --git a/app/services/ci/resource_groups/assign_resource_from_resource_group_service.rb b/app/services/ci/resource_groups/assign_resource_from_resource_group_service.rb
index 9e3e6de3928..1d329fe7b53 100644
--- a/app/services/ci/resource_groups/assign_resource_from_resource_group_service.rb
+++ b/app/services/ci/resource_groups/assign_resource_from_resource_group_service.rb
@@ -5,6 +5,8 @@ module Ci
     class AssignResourceFromResourceGroupService < ::BaseService
       # rubocop: disable CodeReuse/ActiveRecord
       def execute(resource_group)
+        release_resource_from_stale_jobs(resource_group)
+
         free_resources = resource_group.resources.free.count
 
         resource_group.processables.waiting_for_resource.take(free_resources).each do |processable|
@@ -12,6 +14,14 @@ module Ci
         end
       end
       # rubocop: enable CodeReuse/ActiveRecord
+
+      private
+
+      def release_resource_from_stale_jobs(resource_group)
+        resource_group.resources.stale_processables.find_each do |processable|
+          resource_group.release_resource_from(processable)
+        end
+      end
     end
   end
 end