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) Fix acceptance using Vagrant configs, allow flexible starting Puppet version #91

Merged
merged 2 commits into from
Mar 14, 2016

Conversation

MikaelSmith
Copy link
Contributor

Changes to puppetserver defaults and beaker VM naming caused acceptance
to start failing when using Vagrant. Add the full VM name to
dns_alt_names and increase memory allocated to the master.

Previously acceptance tests would install puppet-agent 1.2.1, then
install the latest puppetserver prompting an upgrade to a new version of
puppet-agent. Now always install the latest puppet-agent and
puppetserver.

Also provide an environment variable, PUPPET_CLIENT_VERSION to allow
specifying the starting Puppet version for acceptance tests. This
provides a flexible way to run tests of Puppet from any prior version to
the latest.

Michael Smith added 2 commits March 11, 2016 12:50
Changes to puppetserver defaults and beaker VM naming caused acceptance
to start failing when using Vagrant. Add the full VM name to
dns_alt_names and increase memory allocated to the master.
Previously acceptance tests would install puppet-agent 1.2.1, then
install the latest puppetserver prompting an upgrade to a new version of
puppet-agent. Now always install the latest puppet-agent and
puppetserver.

Also provide an environment variable, `PUPPET_CLIENT_VERSION` to allow
specifying the starting Puppet version for acceptance tests. This
provides a flexible way to run tests of Puppet from any prior version to
the latest.
@MikaelSmith MikaelSmith changed the title (maint) Fix acceptance using Vagrant configs (maint) Fix acceptance using Vagrant configs, allow flexible starting Puppet version Mar 11, 2016
@MikaelSmith
Copy link
Contributor Author

This is helpful for testing #81.

@@ -45,7 +45,7 @@ def install_modules_on(host)
master['puppetservice'] = 'puppetserver'
master['puppetserver-confdir'] = '/etc/puppetlabs/puppetserver/conf.d'
master['type'] = 'aio'
install_puppet_agent_on master, {:puppet_agent_version => '1.2.1'}
install_puppet_agent_on master, {}
Copy link
Contributor

Choose a reason for hiding this comment

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

Is the {} necessary, since it's the default on the method signature?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, because the description did not match the actual call signature. See voxpupuli/beaker#1080.

Copy link
Contributor

Choose a reason for hiding this comment

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

Interesting. 👍 , then.

highb added a commit that referenced this pull request Mar 14, 2016
(maint) Fix acceptance using Vagrant configs, allow flexible starting Puppet version
@highb highb merged commit cbd33ee into puppetlabs:master Mar 14, 2016
@MikaelSmith MikaelSmith deleted the fix-vagrant-acceptance branch March 17, 2016 23:14
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.

2 participants