Skip to content

Commit 9778794

Browse files
ekohlevgeni
authored andcommitted
Update gems to support testing Puppet 8
1 parent 2bdd46a commit 9778794

File tree

6 files changed

+10
-23
lines changed

6 files changed

+10
-23
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ name: CI
33

44
on:
55
pull_request:
6-
schedule:
7-
- cron: '4 4 * * *'
86

97

108
concurrency:
@@ -14,7 +12,7 @@ concurrency:
1412
jobs:
1513
puppet:
1614
name: Puppet
17-
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v1
15+
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
1816
with:
1917
pidfile_workaround: 'true'
2018
rubocop: false

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ vendor/
2929
.ruby-*
3030

3131
## rspec
32-
spec/fixtures/
32+
spec/fixtures/manifests
33+
spec/fixtures/modules
3334
junit/
3435

3536
## Puppet module

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ More filter info available [here](https://relishapp.com/rspec/rspec-core/v/3-9/d
194194
To run OS specific tests:
195195

196196
```shell
197-
SPEC_FACTS_OS=redhat-7-x86_64 bundle exec rspec spec/classes/foreman_spec.rb
197+
SPEC_FACTS_OS=redhat-8-x86_64 bundle exec rspec spec/classes/foreman_spec.rb
198198
```
199199

200200
If you have more than one version of `redhat` OS specified in metadata.json,

Gemfile

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,17 @@
33

44
source 'https://rubygems.org'
55

6-
gem 'puppet', ENV['PUPPET_GEM_VERSION'] || '>= 5.5', groups: ['development', 'test']
6+
gem 'puppet', ENV.fetch('PUPPET_GEM_VERSION', '>= 7'), groups: ['development', 'test']
77
gem 'rake'
88

99
gem 'kafo_module_lint', {"groups"=>["test"]}
10-
gem 'puppet-lint-empty_string-check', {"groups"=>["test"]}
11-
gem 'puppet-lint-file_ensure-check', {"groups"=>["test"]}
12-
gem 'puppet-lint-param-docs', '>= 1.3.0', {"groups"=>["test"]}
13-
gem 'puppet-lint-spaceship_operator_without_tag-check', {"groups"=>["test"]}
14-
gem 'puppet-lint-strict_indent-check', {"groups"=>["test"]}
15-
gem 'puppet-lint-undef_in_function-check', {"groups"=>["test"]}
16-
gem 'voxpupuli-test', '~> 5.0', {"groups"=>["test"]}
10+
gem 'puppet-lint-spaceship_operator_without_tag-check', '~> 1.0', {"groups"=>["test"]}
11+
gem 'voxpupuli-test', '~> 7.0', {"groups"=>["test"]}
1712
gem 'github_changelog_generator', '>= 1.15.0', {"groups"=>["development"]}
18-
gem 'puppet_metadata', '~> 1.3'
13+
gem 'puppet_metadata', '~> 3.4'
1914
gem 'puppet-blacksmith', '>= 6.0.0', {"groups"=>["development"]}
20-
gem 'voxpupuli-acceptance', '~> 1.0', {"groups"=>["system_tests"]}
15+
gem 'voxpupuli-acceptance', '~> 2.0', {"groups"=>["system_tests"]}
2116
gem 'puppetlabs_spec_helper', {"groups"=>["system_tests"]}
2217
gem 'hocon'
2318

24-
# Pin rdoc to prevent updating bundled psych (https://github.com/ruby/rdoc/commit/ebe185c8775b2afe844eb3da6fa78adaa79e29a4)
25-
gem 'rdoc', '< 6.4'
26-
2719
# vim:ft=ruby

spec/spec_helper_acceptance.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require 'voxpupuli/acceptance/spec_helper_acceptance'
22

3-
ENV['BEAKER_setfile'] ||= 'centos7-64{hostname=centos7-64.example.com}'
3+
ENV['BEAKER_setfile'] ||= 'centos8-64{hostname=centos8-64.example.com}'
44

55
configure_beaker(modules: :fixtures) do |host|
66
if fact_on(host, 'os.family') == 'RedHat'

spec/support/trusted.rb

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)