Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Puppet 7 #1288

Merged
merged 3 commits into from
Dec 15, 2020
Merged

Support Puppet 7 #1288

merged 3 commits into from
Dec 15, 2020

Conversation

treydock
Copy link
Collaborator

@treydock treydock commented Nov 22, 2020

Pull Request Checklist

Description

Add support for Puppet 7 (and Facter 4)

I did not use Ruby 2.7.0 for acceptance tests because the RVM version of Ruby used for beaker tests has zero impact on the tests, the version of Ruby and Puppet used for the test is set by BEAKER_PUPPET_COLLECTION so you can use whatever version of Ruby is supported by the beaker code and it won't impact the version of Ruby used for actual acceptance tests. The beaker library is not yet validated on Ruby 2.7 so I opted for safest approach while still testing proper version of Puppet and Ruby inside Docker. It's sort of like installing RVM Ruby 2.0.0 on a host and it having no impact on Puppet Ruby because Puppet Ruby is embedded in the puppet-agent package, and the beaker tests are using puppet-agent packages.

@treydock treydock requested a review from ghoneycutt November 22, 2020 17:43
@treydock treydock force-pushed the puppet7 branch 2 times, most recently from 4e6e834 to 3451a12 Compare November 22, 2020 22:40
@treydock treydock changed the title Support Puppet 7 and remove EOL OS support Support Puppet 7 Dec 2, 2020
@treydock
Copy link
Collaborator Author

treydock commented Dec 2, 2020

Modified pull request to only add Puppet 7 support.

.travis.yml Show resolved Hide resolved
@treydock treydock force-pushed the puppet7 branch 2 times, most recently from f689bbc to d7b4d65 Compare December 2, 2020 02:37
@@ -3,6 +3,15 @@
describe 'sensu::backend class', if: ['base','full'].include?(RSpec.configuration.sensu_mode) do
backend = hosts_as('sensu-backend')[0]
agent = hosts_as('sensu-agent')[0]
let(:facter_command) do
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code is getting duplicated. To DRY things up, could it be moved to the spec_helper?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not really. It's best to define variables in rspec using let to ensure proper test isolation and not a great way to do that in central place that I know of. It's also slightly differen logic for Windows tests than other tests so not much to DRY up.

@ghoneycutt ghoneycutt merged commit 724727c into master Dec 15, 2020
@ghoneycutt ghoneycutt deleted the puppet7 branch December 15, 2020 21:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants