(PA-5781) Use Beaker 5 in puppetlabs-augeas_core #74
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AriaXLi
force-pushed
the
PA-5781/beaker_5
branch
from
d9c0c57 to
d597645
Compare
joshcooper
reviewed
Feb 14, 2024
AriaXLi
force-pushed
the
PA-5781/beaker_5
branch
from
d597645 to
95544e2
Compare
This commit updates .sync.yml and Gemfile to use newer beaker dependencies: beaker 5.x beaker-abs 1.x beaker-puppet 3.x This commit also removes beaker-pe.
AriaXLi
force-pushed
the
PA-5781/beaker_5
branch
from
95544e2 to
5fb5f93
Compare
Previously, when running with beaker 5 and latest beaker-puppet, tests failed
with:
cannot add defaults of type pe for host redhat7-64-1 (add_pe_defaults_on not present)
The error came from beaker-puppet when it tried to configure the host as a PE
agent[1].
The root cause is beaker defaults its options to `pe`[2]. When `beaker-puppet`
calls the `configure_type_defaults_on` method, it calls the appropriate
`add_<type>_defaults_on` method. This works when using beaker 4 as `beaker-pe`
is pulled in as a dependency and its `add_pe_defaults_on` method[3] is included
into the tests.
However, when running with beaker5, beaker-pe is not loaded, so the method is
undefined. It appears beaker-puppet_install_helper is responsible for the
whether beaker-pe is loaded or not, but only when using
beaker-puppet_install_helper 0.9.4.
Since these tests don't actually depend on PE, drop beaker-pe, require
'beaker-puppet' directly (so the install_from_build_data_url method exists) and
configure the host type directly.
[1] https://github.com/puppetlabs/beaker-puppet/blob/7175b5c1acb5cddb3a31ddcc114f09cddd3b83d0/lib/beaker-puppet/install_utils/puppet_utils.rb#L167
[2] https://github.com/voxpupuli/beaker/blob/c61ee381d3801bad70989d9b3cbf970771e6f330/lib/beaker/options/presets.rb#L139
[3] https://github.com/puppetlabs/beaker-pe/blob/3bfe913b8d57c805cc0c51ae899fff174224d5f5/lib/beaker-pe/install/pe_defaults.rb#L93
Commit originally from joshcooper/puppetlabs-cron_core@d456d2a
AriaXLi
force-pushed
the
PA-5781/beaker_5
branch
from
5fb5f93 to
9f45ae0
Compare
mhashizume
approved these changes
Feb 15, 2024
mhashizume
added
the
maintenance
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.