Skip to content

Commit 7534cbe

Browse files
committed
Fix beaker task
In puppetlabs_spec_helper 4.x the beaker task was removed. This loads it from voxpupuli-aceptance.
1 parent 4c4684c commit 7534cbe

File tree

3 files changed

+22
-5
lines changed

3 files changed

+22
-5
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
puppet_major_versions: ${{ steps.get_outputs.outputs.puppet_major_versions }}
1616
puppet_unit_test_matrix: ${{ steps.get_outputs.outputs.puppet_unit_test_matrix }}
1717
env:
18-
BUNDLE_WITHOUT: development:release
18+
BUNDLE_WITHOUT: development:system_tests:release
1919
steps:
2020
- uses: actions/checkout@v2
2121
- name: Setup ruby

Gemfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@ gem 'puppet-lint-param-docs', '>= 1.3.0', {"groups"=>["test"]}
1313
gem 'puppet-lint-spaceship_operator_without_tag-check', {"groups"=>["test"]}
1414
gem 'puppet-lint-strict_indent-check', {"groups"=>["test"]}
1515
gem 'puppet-lint-undef_in_function-check', {"groups"=>["test"]}
16-
gem 'voxpupuli-test', '~> 1.4'
16+
gem 'voxpupuli-test', '~> 1.4', {"groups"=>["test"]}
1717
gem 'github_changelog_generator', '>= 1.15.0', {"groups"=>["development"]}
1818
gem 'puppet_metadata', '~> 0.3'
1919
gem 'puppet-blacksmith', '>= 6.0.0', {"groups"=>["development"]}
2020
gem 'voxpupuli-acceptance', '~> 1.0', {"groups"=>["system_tests"]}
21+
gem 'puppetlabs_spec_helper', {"groups"=>["system_tests"]}
2122
gem 'hocon'
2223

2324
# vim:ft=ruby

Rakefile

+19-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,26 @@
11
# This file is managed centrally by modulesync
22
# https://github.com/theforeman/foreman-installer-modulesync
33

4-
require 'voxpupuli/test/rake'
4+
# Attempt to load voxupuli-test (which pulls in puppetlabs_spec_helper),
5+
# otherwise attempt to load it directly.
6+
begin
7+
require 'voxpupuli/test/rake'
8+
rescue LoadError
9+
begin
10+
require 'puppetlabs_spec_helper/rake_tasks'
11+
rescue LoadError
12+
end
13+
end
514

6-
# We use fixtures in our modules, which is not the default
7-
task :beaker => 'spec_prep'
15+
# load optional tasks for acceptance
16+
# only available if gem group releases is installed
17+
begin
18+
require 'voxpupuli/acceptance/rake'
19+
rescue LoadError
20+
else
21+
# We use fixtures in our modules, which is not the default
22+
task :beaker => 'spec_prep'
23+
end
824

925
# blacksmith isn't always present, e.g. on Travis with --without development
1026
begin

0 commit comments

Comments
 (0)