Use group_type? where possible during transition period

This commit is contained in:
Dylan Griffith 2018-05-01 13:11:57 +04:00
parent 1a6d9789db
commit 36cdd1e717
4 changed files with 5 additions and 5 deletions

View File

@ -17,7 +17,7 @@ module Ci
builds =
if runner.shared?
builds_for_shared_runner
elsif runner.assigned_to_group?
elsif runner.group_type?
builds_for_group_runner
else
builds_for_project_runner

View File

@ -2,7 +2,7 @@
%td
- if runner.shared?
%span.label.label-success shared
- elsif runner.assigned_to_group?
- elsif runner.group_type?
%span.label.label-success group
- else
%span.label.label-info specific
@ -21,7 +21,7 @@
%td
= runner.ip_address
%td
- if runner.shared? || runner.assigned_to_group?
- if runner.shared? || runner.group_type?
n/a
- else
= runner.projects.count(:all)

View File

@ -19,7 +19,7 @@
%p
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.
- elsif @runner.assigned_to_group?
- elsif @runner.group_type?
.bs-callout.bs-callout-success
%h4 This runner will process jobs from all projects in its group and subgroups
- else

View File

@ -8,7 +8,7 @@ module Ci
let!(:pending_job) { create :ci_build, pipeline: pipeline }
let!(:shared_runner) { create :ci_runner, is_shared: true }
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
specific_runner.assign_to(project)