Skip to content

Commit b1e668c

Browse files
authored
Merge pull request #840 from bastelfreak/runners
CI: Make runners configureable
2 parents 88ce96f + 73dfcec commit b1e668c

1 file changed

Lines changed: 10 additions & 1 deletion

File tree

moduleroot/.github/workflows/ci.yml.erb

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,15 @@ jobs:
1717
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v1
1818
with:
1919
pidfile_workaround: '<%= @configs['pidfile_workaround'] %>'
20+
<%- if @configs['unit_runs_on'] -%>
21+
unit_runs_on: '<%= @configs['unit_runs_on'] %>'
22+
<%- end -%>
23+
<%- if @configs['acceptance_runs_on'] -%>
24+
acceptance_runs_on: '<%= @configs['acceptance_runs_on'] %>'
25+
<%- end -%>
2026
<%- else -%>
2127
uses: voxpupuli/gha-puppet/.github/workflows/basic.yml@v1
22-
<%- if @configs.key?('rubocop') || !@configs['additional_packages'].empty? -%>
28+
<%- if @configs.key?('rubocop') || !@configs['additional_packages'].empty? || @configs.key?('unit_runs_on') -%>
2329
with:
2430
<%- end -%>
2531
<%- end -%>
@@ -29,3 +35,6 @@ jobs:
2935
<%- if @configs.key?('rubocop') -%>
3036
rubocop: <%= @configs['rubocop'] %>
3137
<%- end -%>
38+
<%- if Dir[File.join(@metadata[:workdir], 'spec', 'acceptance', '**', '*_spec.rb')].none? && @configs['unit_runs_on'] -%>
39+
unit_runs_on: '<%= @configs['unit_runs_on'] %>'
40+
<%- end -%>

0 commit comments

Comments
 (0)