Merge pull request #91 from MikaelSmith/fix-vagrant-acceptance

(maint) Fix acceptance using Vagrant configs, allow flexible starting Puppet version
puppetlabs · Mar 14, 2016 · cbd33ee · cbd33ee
2 parents 22f0d37 + e5b3886
commit cbd33ee
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 6 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -80,12 +80,20 @@ Beaker tests with:
     bundle exec rake acceptance
 
 This will use the host described in `spec/acceptance/nodeset/default.yml`
-by default. To run against another host, set the `BEAKER_set` environment
-variable to the name of a host described by a `.yml` file in the
-`nodeset` directory. For example, to run against CentOS 6.4:
+and start from Puppet 3.8.6 by default.
+
+To run against another host, set the `BEAKER_set` environment variable to
+the name of a host described by a `.yml` file in the `nodeset` directory.
+For example, to run against CentOS 6.4:
 
     BEAKER_set=centos-64-x64 bundle exec rake acceptance
 
+To run starting from a different Puppet version, set the
+`PUPPET_CLIENT_VERSION` environment variable to a full version string. For
+example, to start with Puppet 3.7.1:
+
+    PUPPET_CLIENT_VERSION=3.7.1 bundle exec rake acceptance
+
 If you don't want to have to recreate the virtual machine every time you
 can use `BEAKER_destroy=no` and `BEAKER_provision=no`. On the first run you will
 at least need `BEAKER_provision` set to yes (the default). The Vagrantfile

diff --git a/spec/acceptance/nodesets/centos-5-x64.yml b/spec/acceptance/nodesets/centos-5-x64.yml
@@ -7,6 +7,7 @@ HOSTS:
     box: puppetlabs/centos-7.0-64-nocm
     box_url: https://vagrantcloud.com/puppetlabs/boxes/centos-7.0-64-nocm
     hypervisor: vagrant
+    vagrant_memsize: 3072
 
   agent:
     roles:

diff --git a/spec/acceptance/nodesets/centos-6-x64.yml b/spec/acceptance/nodesets/centos-6-x64.yml
@@ -7,6 +7,7 @@ HOSTS:
     box: puppetlabs/centos-7.0-64-nocm
     box_url: https://vagrantcloud.com/puppetlabs/boxes/centos-7.0-64-nocm
     hypervisor: vagrant
+    vagrant_memsize: 3072
 
   agent:
     roles:

diff --git a/spec/acceptance/nodesets/debian-6-x64.yml b/spec/acceptance/nodesets/debian-6-x64.yml
@@ -7,6 +7,7 @@ HOSTS:
     box: puppetlabs/centos-7.0-64-nocm
     box_url: https://vagrantcloud.com/puppetlabs/boxes/centos-7.0-64-nocm
     hypervisor: vagrant
+    vagrant_memsize: 3072
 
   agent:
     roles:

diff --git a/spec/acceptance/nodesets/debian-7-x64.yml b/spec/acceptance/nodesets/debian-7-x64.yml
@@ -7,6 +7,7 @@ HOSTS:
     box: puppetlabs/centos-7.0-64-nocm
     box_url: https://vagrantcloud.com/puppetlabs/boxes/centos-7.0-64-nocm
     hypervisor: vagrant
+    vagrant_memsize: 3072
 
   agent:
     roles:

diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
@@ -7,6 +7,7 @@ HOSTS:
     box: puppetlabs/centos-7.0-64-nocm
     box_url: https://vagrantcloud.com/puppetlabs/boxes/centos-7.0-64-nocm
     hypervisor: vagrant
+    vagrant_memsize: 3072
 
   agent:
     roles:

diff --git a/spec/acceptance/nodesets/ubuntu-1204-x64.yml b/spec/acceptance/nodesets/ubuntu-1204-x64.yml
@@ -7,6 +7,7 @@ HOSTS:
     box: puppetlabs/centos-7.0-64-nocm
     box_url: https://vagrantcloud.com/puppetlabs/boxes/centos-7.0-64-nocm
     hypervisor: vagrant
+    vagrant_memsize: 3072
 
   agent:
     roles:

diff --git a/spec/acceptance/nodesets/ubuntu-1404-x64.yml b/spec/acceptance/nodesets/ubuntu-1404-x64.yml
@@ -7,6 +7,7 @@ HOSTS:
     box: puppetlabs/centos-7.0-64-nocm
     box_url: https://vagrantcloud.com/puppetlabs/boxes/centos-7.0-64-nocm
     hypervisor: vagrant
+    vagrant_memsize: 3072
 
   agent:
     roles:

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -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, {}
     install_package master, 'puppetserver'
     master['use-service'] = true
 
@@ -91,7 +91,7 @@ def parser_opts
 
 def server_opts
   {
-    :master => {:autosign => true},
+    :master => {:autosign => true, :dns_alt_names => master},
   }
 end
 
@@ -100,7 +100,7 @@ def setup_puppet_on(host, opts = {})
 
   puts "Setup foss puppet on #{host}"
   configure_defaults_on host, 'foss'
-  install_puppet_on host
+  install_puppet_on host, :version => ENV['PUPPET_CLIENT_VERSION'] || '3.8.6'
 
   configure_puppet_on(host, parser_opts)