Add latest changes from gitlab-org/gitlab@master

2 files changed, 18 insertions, 1 deletions

diff --git a/app/services/ci/prepare_build_service.rb b/app/services/ci/prepare_build_service.rb
index 5d024c45e5f..3f87c711270 100644
--- a/app/services/ci/prepare_build_service.rb
+++ b/app/services/ci/prepare_build_service.rb
@@ -11,7 +11,7 @@ module Ci
     def execute
       prerequisites.each(&:complete!)
 
-      build.enqueue!
+      build.enqueue_preparing!
     rescue => e
       Gitlab::ErrorTracking.track_exception(e, build_id: build.id)
 
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
new file mode 100644
index 00000000000..a4bcca8e8b3
--- /dev/null
+++ b/app/services/ci/resource_groups/assign_resource_from_resource_group_service.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Ci
+  module ResourceGroups
+    class AssignResourceFromResourceGroupService < ::BaseService
+      # rubocop: disable CodeReuse/ActiveRecord
+      def execute(resource_group)
+        free_resources = resource_group.resources.free.count
+
+        resource_group.builds.waiting_for_resource.take(free_resources).each do |build|
+          build.enqueue_waiting_for_resource
+        end
+      end
+      # rubocop: enable CodeReuse/ActiveRecord
+    end
+  end
+end