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
36cdd1e7
Commit
36cdd1e7
authored
May 01, 2018
by
Dylan Griffith
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use group_type? where possible during transition period
parent
1a6d9789
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
app/services/ci/register_job_service.rb
app/services/ci/register_job_service.rb
+1
-1
app/views/admin/runners/_runner.html.haml
app/views/admin/runners/_runner.html.haml
+2
-2
app/views/admin/runners/show.html.haml
app/views/admin/runners/show.html.haml
+1
-1
spec/services/ci/register_job_service_spec.rb
spec/services/ci/register_job_service_spec.rb
+1
-1
No files found.
app/services/ci/register_job_service.rb
View file @
36cdd1e7
...
@@ -17,7 +17,7 @@ module Ci
...
@@ -17,7 +17,7 @@ module Ci
builds
=
builds
=
if
runner
.
shared?
if
runner
.
shared?
builds_for_shared_runner
builds_for_shared_runner
elsif
runner
.
assigned_to_group
?
elsif
runner
.
group_type
?
builds_for_group_runner
builds_for_group_runner
else
else
builds_for_project_runner
builds_for_project_runner
...
...
app/views/admin/runners/_runner.html.haml
View file @
36cdd1e7
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
%td
%td
-
if
runner
.
shared?
-
if
runner
.
shared?
%span
.label.label-success
shared
%span
.label.label-success
shared
-
elsif
runner
.
assigned_to_group
?
-
elsif
runner
.
group_type
?
%span
.label.label-success
group
%span
.label.label-success
group
-
else
-
else
%span
.label.label-info
specific
%span
.label.label-info
specific
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
%td
%td
=
runner
.
ip_address
=
runner
.
ip_address
%td
%td
-
if
runner
.
shared?
||
runner
.
assigned_to_group
?
-
if
runner
.
shared?
||
runner
.
group_type
?
n/a
n/a
-
else
-
else
=
runner
.
projects
.
count
(
:all
)
=
runner
.
projects
.
count
(
:all
)
...
...
app/views/admin/runners/show.html.haml
View file @
36cdd1e7
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
%p
%p
If you want Runners to build only specific projects, enable them in the table below.
If you want Runners to build only specific projects, enable them in the table below.
Keep in mind that this is a one way transition.
Keep in mind that this is a one way transition.
-
elsif
@runner
.
assigned_to_group
?
-
elsif
@runner
.
group_type
?
.bs-callout.bs-callout-success
.bs-callout.bs-callout-success
%h4
This runner will process jobs from all projects in its group and subgroups
%h4
This runner will process jobs from all projects in its group and subgroups
-
else
-
else
...
...
spec/services/ci/register_job_service_spec.rb
View file @
36cdd1e7
...
@@ -8,7 +8,7 @@ module Ci
...
@@ -8,7 +8,7 @@ module Ci
let!
(
:pending_job
)
{
create
:ci_build
,
pipeline:
pipeline
}
let!
(
:pending_job
)
{
create
:ci_build
,
pipeline:
pipeline
}
let!
(
:shared_runner
)
{
create
:ci_runner
,
is_shared:
true
}
let!
(
:shared_runner
)
{
create
:ci_runner
,
is_shared:
true
}
let!
(
:specific_runner
)
{
create
:ci_runner
,
is_shared:
false
}
let!
(
:specific_runner
)
{
create
:ci_runner
,
is_shared:
false
}
let!
(
:group_runner
)
{
create
:ci_runner
,
groups:
[
group
]
}
let!
(
:group_runner
)
{
create
:ci_runner
,
groups:
[
group
]
,
runner_type: :group_type
}
before
do
before
do
specific_runner
.
assign_to
(
project
)
specific_runner
.
assign_to
(
project
)
...
...
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