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

(maint) Use BKR-314 and BKR-317 fixes #32

Merged

Conversation

MikaelSmith
Copy link
Contributor

BKR-314 and BKR-317 identified issues with using Beaker helpers for
upgrade scenarios. Simplify the acceptance setup by using Beaker helpers
now that they're fixed.

Beaker 2.15 was released with fixes for BKR-314 and BKR-317.

install_package host, 'puppet'
add_foss_defaults_on host
add_puppet_paths_on host
install_puppet_on host
Copy link
Contributor

Choose a reason for hiding this comment

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

We should be adding options here for version and architecture for windows users?
https://github.com/puppetlabs/puppetlabs-stdlib/blob/master/spec/spec_helper_acceptance.rb#L7 as well as version numbers.
Also the above step method should be removed as this has been yanked for beaker-rspec

Copy link
Contributor Author

Choose a reason for hiding this comment

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

All the step methods should be removed, but I hadn't heard they were officially yanked from beaker-rspec.

Anything that needs to be added for Windows would happen under PUP-4479.

@MikaelSmith MikaelSmith force-pushed the maint/master/use-BKR-317-314 branch from e2e5e0e to 6d1ebf0 Compare July 6, 2015 18:00
@MikaelSmith MikaelSmith changed the title WIP (maint) Use BKR-314 and BKR-317 fixes (maint) Use BKR-314 and BKR-317 fixes Jul 6, 2015
@MikaelSmith MikaelSmith force-pushed the maint/master/use-BKR-317-314 branch from 6d1ebf0 to 3cc230d Compare July 7, 2015 23:52
@MikaelSmith MikaelSmith changed the title (maint) Use BKR-314 and BKR-317 fixes WIP (maint) Use BKR-314 and BKR-317 fixes Jul 7, 2015
@MikaelSmith MikaelSmith force-pushed the maint/master/use-BKR-317-314 branch from 3cc230d to 027a279 Compare July 8, 2015 00:12
Michael Smith added 3 commits July 7, 2015 17:13
BKR-314 and BKR-317 identified issues with using Beaker helpers for
upgrade scenarios. Simplify the acceptance setup by using Beaker helpers
now that they're fixed.
Using `step` with beaker-rspec is frowned-upon. Remove it and use `puts`
instead.
Ensure sudo is not used so we use TravisCI container-based builds.
@MikaelSmith MikaelSmith force-pushed the maint/master/use-BKR-317-314 branch from 027a279 to c754bb1 Compare July 8, 2015 00:14
@MikaelSmith MikaelSmith changed the title WIP (maint) Use BKR-314 and BKR-317 fixes (maint) Use BKR-314 and BKR-317 fixes Jul 8, 2015
@MikaelSmith
Copy link
Contributor Author

@ericwilliamson mind taking a look over this and merging if it looks good? Jenkins tests are broken because of Beaker 2.16, and this fixes them.

@@ -11,6 +11,6 @@ group :test do
end

group :system_tests do
gem 'beaker', '~> 2.14'
gem 'beaker', '~> 2.15'
Copy link
Member

Choose a reason for hiding this comment

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

you mention it's broken for beaker 2.16, should we be pinning to that instead of 2.15 as the minimum version?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The behavior changed, so that makes sense.

@MikaelSmith MikaelSmith force-pushed the maint/master/use-BKR-317-314 branch from c754bb1 to da92f18 Compare July 9, 2015 22:24
Beaker 2.16 requires the `puppet_agent_version` is set for
`install_puppet_agent_on`. Set to the latest puppet-agent version.

[skip ci] no effect on TravisCI
@MikaelSmith MikaelSmith force-pushed the maint/master/use-BKR-317-314 branch from da92f18 to 58b1d74 Compare July 9, 2015 22:26
@ericwilliamson
Copy link
Member

👍

ericwilliamson added a commit that referenced this pull request Jul 9, 2015
@ericwilliamson ericwilliamson merged commit 7b55406 into puppetlabs:master Jul 9, 2015
@MikaelSmith MikaelSmith deleted the maint/master/use-BKR-317-314 branch July 9, 2015 22:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants