Commit 36cdd1e7 authored by Dylan Griffith's avatar Dylan Griffith

Use group_type? where possible during transition period

parent 1a6d9789
...@@ -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
......
...@@ -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)
......
...@@ -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
......
...@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment