Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
04a2a993
Commit
04a2a993
authored
Sep 15, 2021
by
Marius Bobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Decouple project runners queuing query from projects table
Changelog: added
parent
115b29aa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
13 deletions
+1
-13
app/services/ci/queue/build_queue_service.rb
app/services/ci/queue/build_queue_service.rb
+1
-1
spec/services/ci/register_job_service_spec.rb
spec/services/ci/register_job_service_spec.rb
+0
-12
No files found.
app/services/ci/queue/build_queue_service.rb
View file @
04a2a993
...
...
@@ -47,7 +47,7 @@ module Ci
def
builds_for_project_runner
relation
=
new_builds
.
where
(
project:
runner
.
projects
.
without_deleted
.
with_builds_enabled
)
.
where
(
project:
runner
.
runner_projects
.
select
(
:project_id
)
)
order
(
relation
)
end
...
...
spec/services/ci/register_job_service_spec.rb
View file @
04a2a993
...
...
@@ -79,12 +79,6 @@ module Ci
expect
(
execute
(
shared_runner
)).
to
be_nil
end
end
context
'for specific runner'
do
it
'does not pick a build'
do
expect
(
execute
(
specific_runner
)).
to
be_nil
end
end
end
context
'allow shared runners'
do
...
...
@@ -234,12 +228,6 @@ module Ci
it
{
expect
(
build
).
to
be_nil
}
end
context
'and uses project runner'
do
let
(
:build
)
{
execute
(
specific_runner
)
}
it
{
expect
(
build
).
to
be_nil
}
end
end
context
'allow group runners'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment