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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
48d9a722
Commit
48d9a722
authored
Sep 25, 2017
by
Tomasz Maczukin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix locked shared runners problem
parent
8b1a3d40
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
52 deletions
+19
-52
app/models/ci/runner.rb
app/models/ci/runner.rb
+1
-1
spec/models/ci/runner_spec.rb
spec/models/ci/runner_spec.rb
+18
-51
No files found.
app/models/ci/runner.rb
View file @
48d9a722
...
@@ -174,7 +174,7 @@ module Ci
...
@@ -174,7 +174,7 @@ module Ci
end
end
def
assignable_for?
(
project
)
def
assignable_for?
(
project
)
!
lock
ed?
||
projects
.
exists?
(
id:
project
.
id
)
is_shar
ed?
||
projects
.
exists?
(
id:
project
.
id
)
end
end
def
accepting_tags?
(
build
)
def
accepting_tags?
(
build
)
...
...
spec/models/ci/runner_spec.rb
View file @
48d9a722
...
@@ -183,75 +183,42 @@ describe Ci::Runner do
...
@@ -183,75 +183,42 @@ describe Ci::Runner do
end
end
end
end
context
'when runner is
lock
ed'
do
context
'when runner is
shar
ed'
do
before
do
before
do
runner
.
locked
=
true
runner
.
is_shared
=
true
build
.
project
.
runners
=
[]
end
end
shared_examples
'locked build picker'
do
it
'can handle builds'
do
context
'when runner cannot pick untagged jobs'
do
expect
(
runner
.
can_pick?
(
build
)).
to
be_truthy
before
do
end
runner
.
run_untagged
=
false
end
it
'cannot handle builds without tags
'
do
context
'when runner is locked
'
do
expect
(
runner
.
can_pick?
(
build
)).
to
be_falsey
before
do
end
runner
.
locked
=
true
end
end
context
'when having runner tags'
do
it
'can handle builds'
do
before
do
expect
(
runner
.
can_pick?
(
build
)).
to
be_truthy
runner
.
tag_list
=
%w(bb cc)
end
it
'cannot handle it for builds without matching tags'
do
build
.
tag_list
=
[
'aa'
]
expect
(
runner
.
can_pick?
(
build
)).
to
be_falsey
end
end
end
end
end
end
context
'when serving the same project'
do
context
'when runner is not shared'
do
it
'can handle it'
do
context
'when runner is assigned to a project'
do
it
'can handle builds'
do
expect
(
runner
.
can_pick?
(
build
)).
to
be_truthy
expect
(
runner
.
can_pick?
(
build
)).
to
be_truthy
end
end
it_behaves_like
'locked build picker'
context
'when having runner tags'
do
before
do
runner
.
tag_list
=
%w(bb cc)
build
.
tag_list
=
[
'bb'
]
end
it
'can handle it for matching tags'
do
expect
(
runner
.
can_pick?
(
build
)).
to
be_truthy
end
end
end
end
context
'
serving a different
project'
do
context
'
when runner is not assigned to a
project'
do
before
do
before
do
runner
.
runner_projects
.
destroy_all
build
.
project
.
runners
=
[]
end
end
it
'cannot handle
it
'
do
it
'cannot handle
builds
'
do
expect
(
runner
.
can_pick?
(
build
)).
to
be_falsey
expect
(
runner
.
can_pick?
(
build
)).
to
be_falsey
end
end
it_behaves_like
'locked build picker'
context
'when having runner tags'
do
before
do
runner
.
tag_list
=
%w(bb cc)
build
.
tag_list
=
[
'bb'
]
end
it
'cannot handle it for matching tags'
do
expect
(
runner
.
can_pick?
(
build
)).
to
be_falsey
end
end
end
end
end
end
...
...
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