-
Notifications
You must be signed in to change notification settings - Fork 66
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
Drop Beaker 4.x specific code #216
Conversation
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## master #216 +/- ##
==========================================
- Coverage 78.19% 77.00% -1.19%
==========================================
Files 15 15
Lines 1605 1522 -83
==========================================
- Hits 1255 1172 -83
Misses 350 350
☔ View full report in Codecov by Sentry. |
8839828
to
0b9ec6d
Compare
678bd73
to
5b16f78
Compare
# install_puppet_agent_pe_promoted_repo_on(host, { :puppet_agent_version => '1.1.0.227', :pe_ver => '4.0.0-rc1'}) | ||
# | ||
# @return nil | ||
def install_puppet_agent_pe_promoted_repo_on( hosts, opts ) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As an aside, these PE specific repos will need to be modified to no longer call this method:
https://github.com/puppetlabs/pe_acceptance_tests/blob/54f960d6cf2c74fcd7f4f749d0b2b4eb9cc5f7a3/setup/prep_legacy.rb#L11
https://github.com/puppetlabs/beaker-pe/blob/9f82cf638e58e32de67a3c2c1239be70fd4781a0/lib/beaker-pe/install/pe_utils.rb#L924
Going to close and reopen to trigger CI checks |
@bastelfreak could you rebase? If you busy, would it be ok if we rebased for you and opened a new PR with your commits? |
I doubt that I have time to continue this. We started with it to be able to switch to beaker 5. But vox pupuli doesn't use beaker-puppet anymore. |
@joshcooper oh sure, please rebase! |
else | ||
puppet_master_started = start_puppet_from_source_on!( host, cmdline_args ) | ||
end | ||
puppet_master_started = start_puppet_from_source_on!( host, cmdline_args ) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we need to keep the bounce_service
call instead of using start_puppet_from_source_on!
, as the latter runs $ puppet master
which doesn't work on Puppet >= 6:
host.exec(puppet('master', args)) |
We presumably don't need the
start_puppet_from_source_on!
method at all going forward since it primarily just runs $ puppet master
Closing this in favor of #240 |
No description provided.