vagrant-pe_build 0.17.12 → 0.17.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dde8e4aa63e9b8d3f770bb753a348d0cbc9fa3ea
-  data.tar.gz: 94a24d49a2f103c405c5c81342b927f84adf4455
+  metadata.gz: 91347d9421c7137507136b843bc30f25028aebe9
+  data.tar.gz: 8f0de603d2c7ef226253fcb673db247906327eed
 SHA512:
-  metadata.gz: 2a3606b19d532d2e3dc215a75c8201f4324798382429897b322eaea83a97a01b2af10b5f7acc082b6eadb787a9e5d0159b1ef892594dd3a7fb68cf3b1c688449
-  data.tar.gz: d2a88998ccb15582d0ee99fc08677bae038b99ff52d687f022150e44d6c6760e8ffdc785c130715a2dcc5f7a2ea86d13a894d85b15f9e4ae9e0be7e1979db4cb
+  metadata.gz: 8f7a2801b27438e8853c90c2c775f8497b62e7f793a1dafe8c2140da2df22fa31d832dce03c66ed9b31c941fe6ae5ca459637e587de10b0ecefdd8e56482d0b6
+  data.tar.gz: 891f01979135263f16d7993b920c711ea5ad22d0dee6799bf199defb8f34066ff925c047d3336fdcd33d2d6bde3f6ece52df938c6ed6696a907d90820311b70a

data/.travis.yml

@@ -26,5 +26,9 @@ matrix:
       env: TEST_VAGRANT_VERSION=v1.8.7 BUNDLER_VERSION=1.12.5
     - rvm: 2.3.4
       env: TEST_VAGRANT_VERSION=v1.9.8 BUNDLER_VERSION=1.16.1
-    - rvm: 2.4.3
+    - rvm: 2.4.4
+      env: TEST_VAGRANT_VERSION=v2.0.4 BUNDLER_VERSION=1.16.1
+    - rvm: 2.4.4
+      env: TEST_VAGRANT_VERSION=v2.1.1 BUNDLER_VERSION=1.16.1
+    - rvm: 2.4.4
       env: TEST_VAGRANT_VERSION=HEAD BUNDLER_VERSION=1.16.1

data/CHANGELOG

@@ -1,6 +1,24 @@
 vagrant-pe_build
 ================
 
+0.17.13
+-------
+
+2018-06-18
+
+This is a backwards compatible bugfix release.
+
+  * Add support for 2016.4.13
+
+  * Add support for 2017.3.8
+
+  * Add support for 2018.1.2
+
+  * Add Vagrant 2.0 to test matrix.
+
+  * Add Vagrant 2.1 to test matrix.
+
+
 0.17.12
 -------
 

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 require 'rubygems/version'
 
-vagrant_branch = ENV['TEST_VAGRANT_VERSION'] || 'v1.9.8'
+vagrant_branch = ENV['TEST_VAGRANT_VERSION'] || 'v2.1.1'
 vagrant_version = nil
 
 # Wrapping gemspec in the :plugins group causes Vagrant 1.5 and newer to
@@ -26,12 +26,12 @@ group :test do
       :tag => vagrant_branch
   end
 
-  if vagrant_branch.match(/head/i) || (vagrant_version > Gem::Version.new('1.9.3'))
-    # Pinned on 4/11/2017. Compatible with Vagrant > 1.9.3.
+  if vagrant_branch.match(/head/i) || (vagrant_version >= Gem::Version.new('1.9'))
+    # Pinned on 5/11/2018. Compatible with Vagrant > 1.9. Brings in Rspec 3.
     gem 'vagrant-spec', :git => 'https://github.com/hashicorp/vagrant-spec.git',
-      :ref => '1d09951'
+      :ref => '9413ab2'
   elsif vagrant_version
-    # Pinned on 12/10/2014. Compatible with Vagrant 1.6.x -- 1.9.3.
+    # Pinned on 12/10/2014. Compatible with Vagrant 1.6.x -- 1.8.7.
     gem 'vagrant-spec', :git => 'https://github.com/hashicorp/vagrant-spec.git',
       :ref => '1df5a3a'
   end

data/acceptance/pe_build/pe_bootstrap_2015x_spec.rb

@@ -1,5 +1,6 @@
-# NOTE: This acceptance suite actually uses 2016.1 as 2015.2 and 2015.3 shared
-# the same installation workflow.
+# NOTE: This acceptance suite actually uses 2016.1 as 2015.2 -- 2016.1 shared
+# the same installation workflow. 2016.1.2 was the penultimate release for
+# that workflow.
 shared_examples 'provider/provisioner/pe_bootstrap/2015x' do |provider, options|
   if options[:boxes].empty?
     raise ArgumentError,
@@ -27,7 +28,7 @@ shared_examples 'provider/provisioner/pe_bootstrap/2015x' do |provider, options|
 
   after(:each) do
     # Ensure any VMs that survived tests are cleaned up.
-    assert_execute('vagrant', 'destroy', '--force', log: false)
+    execute('vagrant', 'destroy', '--force')
   end
 
   # TODO: Refactor into a shared example so tha this testcase can be run on

data/acceptance/pe_build/pe_bootstrap_2016x_spec.rb

@@ -27,70 +27,39 @@ shared_examples 'provider/provisioner/pe_bootstrap/2016x' do |provider, options|
 
   after(:each) do
     # Ensure any VMs that survived tests are cleaned up.
-    assert_execute('vagrant', 'destroy', '--force', log: false)
+    execute('vagrant', 'destroy', '--force')
   end
 
   # TODO: Refactor into a shared example so tha this testcase can be run on
   # multiple versions.
-  context 'when installing PE 2016.2.x' do
+  context 'when installing PE 2016.4.x' do
 
     it 'provisions masters with pe_bootstrap and agents with pe_agent' do
       status('Test: pe_bootstrap master install')
-      assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-20162-master')
+      assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-20164-master')
 
       status('Test: pe_bootstrap master running after install')
       result = execute('vagrant', 'ssh',
-        'pe-20162-master',
+        'pe-20164-master',
         '-c', 'sudo /opt/puppetlabs/bin/puppet status --terminus=rest')
       expect(result).to exit_with(0)
       expect(result.stdout).to match('"is_alive": true')
 
       status('Test: pe_agent install')
-      result = assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-20162-agent')
+      result = assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-20164-agent')
 
       status('Test: pe_agent signed cert during install')
       result = execute('vagrant', 'ssh',
-        'pe-20162-master',
-        '-c', 'sudo /opt/puppetlabs/bin/puppet cert list pe-20162-agent.pe-bootstrap.vlan')
+        'pe-20164-master',
+        '-c', 'sudo /opt/puppetlabs/bin/puppet cert list pe-20164-agent.pe-bootstrap.vlan')
       expect(result).to exit_with(0)
 
       status('Test: pe_agent cert purged when vm destroyed')
-      result = assert_execute('vagrant', 'destroy', '-f', 'pe-20162-agent')
+      result = assert_execute('vagrant', 'destroy', '-f', 'pe-20164-agent')
       result = execute('vagrant', 'ssh',
-        'pe-20162-master',
-        '-c', 'sudo /opt/puppetlabs/bin/puppet cert list pe-20162-agent.pe-bootstrap.vlan')
+        'pe-20164-master',
+        '-c', 'sudo /opt/puppetlabs/bin/puppet cert list pe-20164-agent.pe-bootstrap.vlan')
       expect(result.stderr).to match(/Could not find a certificate/)
     end
   end
-
-  context 'when installing PE 2016.latest' do
-    it 'provisions masters with pe_bootstrap and agents with pe_agent' do
-      status('Test: pe_bootstrap master install')
-      assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-2016latest-master')
-
-      status('Test: pe_bootstrap master running after install')
-      result = execute('vagrant', 'ssh',
-        'pe-2016latest-master',
-        '-c', 'sudo /opt/puppetlabs/bin/puppet status --terminus=rest')
-      expect(result).to exit_with(0)
-      expect(result.stdout).to match('"is_alive": true')
-
-      status('Test: pe_agent install')
-      result = assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-2016latest-agent')
-
-      status('Test: pe_agent signed cert during install')
-      result = execute('vagrant', 'ssh',
-        'pe-2016latest-master',
-        '-c', 'sudo /opt/puppetlabs/bin/puppet cert list pe-2016latest-agent.pe-bootstrap.vlan')
-      expect(result).to exit_with(0)
-
-      status('Test: pe_agent cert purged when vm destroyed')
-      result = assert_execute('vagrant', 'destroy', '-f', 'pe-2016latest-agent')
-      result = execute('vagrant', 'ssh',
-        'pe-2016latest-master',
-        '-c', 'sudo /opt/puppetlabs/bin/puppet cert list pe-2016latest-agent.pe-bootstrap.vlan')
-      expect(result.stderr).to match(/Could not find a certificate/)
-    end
-  end
-
 end

data/acceptance/pe_build/pe_bootstrap_2018x_spec.rb

@@ -0,0 +1,63 @@
+shared_examples 'provider/provisioner/pe_bootstrap/2018x' do |provider, options|
+  if options[:boxes].empty?
+    raise ArgumentError,
+      "Box files must be downloaded for provider: #{provider}. Try: rake acceptance:setup"
+  end
+
+  include_context 'acceptance'
+
+  let(:extra_env) do
+    vars = options[:env_vars].dup
+    vars['PE_BUILD_DOWNLOAD_ROOT'] = options[:archive_path]
+
+    vars
+  end
+
+  before(:each) do
+    # The skelton sets up a Vagrantfile which expects the OS under test to be
+    # available as `box`.
+    environment.skeleton('2018x_acceptance')
+    options[:boxes].each do |box|
+      name = File.basename(box).split('-').first
+      assert_execute('vagrant', 'box', 'add', name, box)
+    end
+  end
+
+  after(:each) do
+    # Ensure any VMs that survived tests are cleaned up.
+    execute('vagrant', 'destroy', '--force')
+  end
+
+  # TODO: Refactor into a shared example so tha this testcase can be run on
+  # multiple versions.
+  context 'when installing PE 2018.1.x' do
+
+    it 'provisions masters with pe_bootstrap and agents with pe_agent' do
+      status('Test: pe_bootstrap master install')
+      assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-20181-master')
+
+      status('Test: pe_bootstrap master running after install')
+      result = execute('vagrant', 'ssh',
+        'pe-20181-master',
+        '-c', 'sudo /opt/puppetlabs/bin/puppet status --terminus=rest')
+      expect(result).to exit_with(0)
+      expect(result.stdout).to match('"is_alive": true')
+
+      status('Test: pe_agent install')
+      result = assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-20181-agent')
+
+      status('Test: pe_agent signed cert during install')
+      result = execute('vagrant', 'ssh',
+        'pe-20181-master',
+        '-c', 'sudo /opt/puppetlabs/bin/puppet cert list pe-20181-agent.pe-bootstrap.vlan')
+      expect(result).to exit_with(0)
+
+      status('Test: pe_agent cert purged when vm destroyed')
+      result = assert_execute('vagrant', 'destroy', '-f', 'pe-20181-agent')
+      result = execute('vagrant', 'ssh',
+        'pe-20181-master',
+        '-c', 'sudo /opt/puppetlabs/bin/puppet cert list pe-20181-agent.pe-bootstrap.vlan')
+      expect(result.stderr).to match(/Could not find a certificate/)
+    end
+  end
+end

data/acceptance/pe_build/pe_bootstrap_3x_spec.rb

@@ -16,7 +16,7 @@ shared_examples 'provider/provisioner/pe_bootstrap/3x' do |provider, options|
   before(:each) do
     # The skelton sets up a Vagrantfile which expects the OS under test to be
     # available as `box`.
-    environment.skeleton('pe_build')
+    environment.skeleton('3x_acceptance')
     options[:boxes].each do |box|
       name = File.basename(box).split('-').first
       assert_execute('vagrant', 'box', 'add', name, box)
@@ -25,7 +25,7 @@ shared_examples 'provider/provisioner/pe_bootstrap/3x' do |provider, options|
 
   after(:each) do
     # Ensure any VMs that survived tests are cleaned up.
-    assert_execute('vagrant', 'destroy', '--force', log: false)
+    execute('vagrant', 'destroy', '--force')
   end
 
   context 'when installing PE 3.x' do

data/acceptance/pe_build/pe_bootstrap_latest_spec.rb

@@ -6,19 +6,17 @@ shared_examples 'provider/provisioner/pe_bootstrap/latest' do |provider, options
 
   include_context 'acceptance'
 
-  let(:webserver_port) { 3838 }
-  let(:webserver_path) { options[:archive_path] }
   let(:extra_env) do
     vars = options[:env_vars].dup
-    vars['PE_BUILD_DOWNLOAD_ROOT'] = "http://localhost:#{webserver_port}"
+    vars['PE_BUILD_DOWNLOAD_ROOT'] = options[:archive_path]
 
     vars
   end
 
-  include_context 'webserver'
-
   before(:each) do
-    environment.skeleton('pe_build')
+    # The skelton sets up a Vagrantfile which expects the OS under test to be
+    # available as `box`.
+    environment.skeleton('pe_latest_acceptance')
     options[:boxes].each do |box|
       name = File.basename(box).split('-').first
       assert_execute('vagrant', 'box', 'add', name, box)
@@ -27,12 +25,36 @@ shared_examples 'provider/provisioner/pe_bootstrap/latest' do |provider, options
 
   after(:each) do
     # Ensure any VMs that survived tests are cleaned up.
-    assert_execute('vagrant', 'destroy', '--force', log: false)
+    execute('vagrant', 'destroy', '--force')
   end
 
-  context 'when installing LATEST from a build server' do
-    it 'provisions with pe_build' do
-      assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-latest')
+  context 'when installing PE .latest' do
+    it 'provisions masters with pe_bootstrap and agents with pe_agent' do
+      status('Test: pe_bootstrap master install')
+      assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-latest-master')
+
+      status('Test: pe_bootstrap master running after install')
+      result = execute('vagrant', 'ssh',
+        'pe-latest-master',
+        '-c', 'sudo /opt/puppetlabs/bin/puppet status --terminus=rest')
+      expect(result).to exit_with(0)
+      expect(result.stdout).to match('"is_alive": true')
+
+      status('Test: pe_agent install')
+      result = assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-latest-agent')
+
+      status('Test: pe_agent signed cert during install')
+      result = execute('vagrant', 'ssh',
+        'pe-latest-master',
+        '-c', 'sudo /opt/puppetlabs/bin/puppet cert list pe-latest-agent.pe-bootstrap.vlan')
+      expect(result).to exit_with(0)
+
+      status('Test: pe_agent cert purged when vm destroyed')
+      result = assert_execute('vagrant', 'destroy', '-f', 'pe-latest-agent')
+      result = execute('vagrant', 'ssh',
+        'pe-latest-master',
+        '-c', 'sudo /opt/puppetlabs/bin/puppet cert list pe-latest-agent.pe-bootstrap.vlan')
+      expect(result.stderr).to match(/Could not find a certificate/)
     end
   end
 end

data/acceptance/pe_build/pe_build_cli_spec.rb

@@ -7,7 +7,7 @@ module Vagrant
     end
 
     OutputTester[:pe_available] = lambda do |text|
-      text =~ /puppet-enterprise-\d+\.\d\.\d-el-6-x86_64\.tar\.gz/
+      text =~ /puppet-enterprise-\d+\.\d\.\d-el-7-x86_64\.tar\.gz/
     end
   end
 end
@@ -25,7 +25,7 @@ describe 'vagrant CLI: pe-build', component: 'cli/pe-build' do
   include_context 'webserver'
 
   before(:each) do
-    environment.skeleton('pe_build')
+    environment.skeleton('pe_latest_acceptance')
   end
 
   it 'can download archives from remote servers' do
@@ -35,7 +35,7 @@ describe 'vagrant CLI: pe-build', component: 'cli/pe-build' do
 
     result = execute('vagrant', 'pe-build', 'copy',
       "--release=#{options[:pe_latest]}",
-      "#{download_url}/puppet-enterprise-:version-el-6-x86_64.tar.gz")
+      "#{download_url}/puppet-enterprise-:version-el-7-x86_64.tar.gz")
     expect(result).to exit_with(0)
 
     result = execute('vagrant', 'pe-build', 'list')

data/acceptance/skeletons/2015x_acceptance/Vagrantfile

@@ -1,5 +1,6 @@
-# NOTE: This acceptance suite actually uses 2016.1 as 2015.2 and 2015.3 shared
-# the same installation workflow.
+# NOTE: This acceptance suite actually uses 2016.1 as 2015.2 -- 2016.1 shared
+# the same installation workflow. 2016.1.2 was the penultimate release for
+# that workflow.
 def set_resources box, max_ram=512, max_cpu=1
   box.vm.provider :virtualbox do |vb|
     vb.customize ["modifyvm", :id, "--cpus", max_cpu]
@@ -16,7 +17,7 @@ Vagrant.configure('2') do |config|
     node.vm.box      = 'centos'
     # All-in-one master nodes need a generous amount of RAM for all the Java.
     set_resources node, 4096, 1
-    node.vm.provision :shell, :inline => 'service iptables stop'
+    node.vm.provision :shell, :inline => "service iptables stop || true\niptables -F || true"
 
     node.vm.network 'private_network', :ip => '10.20.1.100'
     node.vm.provision :shell, :inline => 'echo "10.20.1.101 pe-20161-agent.pe-bootstrap.vlan" >> /etc/hosts'

data/acceptance/skeletons/2016x_acceptance/Vagrantfile

@@ -11,63 +11,33 @@ Vagrant.configure('2') do |config|
   config.pe_build.download_root = ENV['PE_BUILD_DOWNLOAD_ROOT']
   config.ssh.insert_key = false
 
-  config.vm.define 'pe-20162-master' do |node|
-    node.vm.hostname = 'pe-20162-master.pe-bootstrap.vlan'
+  config.vm.define 'pe-20164-master' do |node|
+    node.vm.hostname = 'pe-20164-master.pe-bootstrap.vlan'
     node.vm.box      = 'centos'
     # All-in-one master nodes need a generous amount of RAM for all the Java.
     set_resources node, 4096, 1
-    node.vm.provision :shell, :inline => 'service iptables stop'
+    node.vm.provision :shell, :inline => "service iptables stop || true\niptables -F || true"
 
     node.vm.network 'private_network', :ip => '10.20.1.102'
-    node.vm.provision :shell, :inline => 'echo "10.20.1.103 pe-20162-agent.pe-bootstrap.vlan" >> /etc/hosts'
+    node.vm.provision :shell, :inline => 'echo "10.20.1.103 pe-20164-agent.pe-bootstrap.vlan" >> /etc/hosts'
 
     node.vm.provision :pe_bootstrap do |p|
-      p.version = '2016.2.0'
+      p.version = '2016.4.11'
       p.role = :master
       # Set autosign to false so that we can test pe_agent functionality.
       p.autosign = false
     end
   end
 
-  config.vm.define 'pe-20162-agent' do |node|
-    node.vm.hostname = 'pe-20162-agent.pe-bootstrap.vlan'
+  config.vm.define 'pe-20164-agent' do |node|
+    node.vm.hostname = 'pe-20164-agent.pe-bootstrap.vlan'
     node.vm.box      = 'ubuntu'
 
     node.vm.network 'private_network', :ip => '10.20.1.103'
-    node.vm.provision :shell, :inline => 'echo "10.20.1.102 pe-20162-master.pe-bootstrap.vlan" >> /etc/hosts'
+    node.vm.provision :shell, :inline => 'echo "10.20.1.102 pe-20164-master.pe-bootstrap.vlan" >> /etc/hosts'
 
     node.vm.provision :pe_agent do |p|
-      p.master_vm = 'pe-20162-master'
-    end
-  end
-
-  config.vm.define 'pe-2016latest-master' do |node|
-    node.vm.hostname = 'pe-2016latest-master.pe-bootstrap.vlan'
-    node.vm.box      = 'centos'
-    # All-in-one master nodes need a generous amount of RAM for all the Java.
-    set_resources node, 4096, 1
-    node.vm.provision :shell, :inline => 'service iptables stop'
-
-    node.vm.network 'private_network', :ip => '10.20.1.104'
-    node.vm.provision :shell, :inline => 'echo "10.20.1.105 pe-2016latest-agent.pe-bootstrap.vlan" >> /etc/hosts'
-
-    node.vm.provision :pe_bootstrap do |p|
-      p.version_file = 'LATEST'
-      p.role = :master
-      # Set autosign to false so that we can test pe_agent functionality.
-      p.autosign = false
-    end
-  end
-
-  config.vm.define 'pe-2016latest-agent' do |node|
-    node.vm.hostname = 'pe-2016latest-agent.pe-bootstrap.vlan'
-    node.vm.box      = 'ubuntu'
-
-    node.vm.network 'private_network', :ip => '10.20.1.105'
-    node.vm.provision :shell, :inline => 'echo "10.20.1.104 pe-2016latest-master.pe-bootstrap.vlan" >> /etc/hosts'
-
-    node.vm.provision :pe_agent do |p|
-      p.master_vm = 'pe-2016latest-master'
+      p.master_vm = 'pe-20164-master'
     end
   end
 end

data/acceptance/skeletons/2018x_acceptance/Vagrantfile

@@ -0,0 +1,69 @@
+def set_resources box, max_ram=512, max_cpu=1
+  box.vm.provider :virtualbox do |vb|
+    vb.customize ["modifyvm", :id, "--cpus", max_cpu]
+    vb.customize ["modifyvm", :id, "--memory", max_ram]
+  end
+end
+
+Vagrant.configure('2') do |config|
+  config.pe_build.download_root = ENV['PE_BUILD_DOWNLOAD_ROOT']
+  config.ssh.insert_key = false
+
+  config.vm.define 'pe-20181-master' do |node|
+    node.vm.hostname = 'pe-20181-master.pe-bootstrap.vlan'
+    node.vm.box      = 'centos'
+    # All-in-one master nodes need a generous amount of RAM for all the Java.
+    set_resources node, 4096, 1
+    node.vm.provision :shell, :inline => "service iptables stop || true\niptables -F || true"
+
+    node.vm.network 'private_network', :ip => '10.20.1.104'
+    node.vm.provision :shell, :inline => 'echo "10.20.1.105 pe-20181-agent.pe-bootstrap.vlan" >> /etc/hosts'
+
+    node.vm.provision :pe_bootstrap do |p|
+      p.version = '2018.1.0'
+      p.role = :master
+      # Set autosign to false so that we can test pe_agent functionality.
+      p.autosign = false
+      # Tune memory usage down.
+      p.answer_extras = [<<-EOS
+"puppet_enterprise::master::puppetserver::jruby_max_active_instances": 1
+"puppet_enterprise::profile::master::java_args": {
+  "Xmx": "384m",
+  "Xms": "128m",
+  "XX:+UseG1GC": ""
+}
+
+"puppet_enterprise::puppetdb::command_processing_threads": 1
+"puppet_enterprise::profile::puppetdb::java_args": {
+  "Xmx": "128m",
+  "Xms": "64m",
+  "XX:+UseG1GC": ""
+}
+"puppet_enterprise::profile::console::java_args": {
+  "Xmx": "64m"
+  "Xms": "64m"
+  "XX:+UseG1GC": ""
+}
+"puppet_enterprise::profile::database::shared_buffers": "4MB"
+"puppet_enterprise::profile::orchestrator::java_args": {
+  "Xmx": "64m",
+  "Xms": "64m",
+  "XX:+UseG1GC": ""
+}
+EOS
+      ]
+    end
+  end
+
+  config.vm.define 'pe-20181-agent' do |node|
+    node.vm.hostname = 'pe-20181-agent.pe-bootstrap.vlan'
+    node.vm.box      = 'ubuntu'
+
+    node.vm.network 'private_network', :ip => '10.20.1.105'
+    node.vm.provision :shell, :inline => 'echo "10.20.1.104 pe-20181-master.pe-bootstrap.vlan" >> /etc/hosts'
+
+    node.vm.provision :pe_agent do |p|
+      p.master_vm = 'pe-20181-master'
+    end
+  end
+end

data/acceptance/skeletons/{pe_build → 3x_acceptance}/Vagrantfile

@@ -17,18 +17,7 @@ Vagrant.configure('2') do |config|
     set_resources node, 4096, 1
 
     node.vm.provision :pe_bootstrap do |p|
-      p.version = '3.8.5'
-      p.role = :master
-    end
-  end
-
-  config.vm.define 'pe-latest' do |node|
-    node.vm.hostname = 'pe-latest.pe-bootstrap.vlan'
-    # All-in-one master nodes need a generous amount of RAM for all the Java.
-    set_resources node, 4096, 1
-
-    node.vm.provision :pe_bootstrap do |p|
-      p.version_file  = 'LATEST_3x'
+      p.version = '3.8.7'
       p.role = :master
     end
   end

data/acceptance/skeletons/pe_latest_acceptance/Vagrantfile

@@ -0,0 +1,69 @@
+def set_resources box, max_ram=512, max_cpu=1
+  box.vm.provider :virtualbox do |vb|
+    vb.customize ["modifyvm", :id, "--cpus", max_cpu]
+    vb.customize ["modifyvm", :id, "--memory", max_ram]
+  end
+end
+
+Vagrant.configure('2') do |config|
+  config.pe_build.download_root = ENV['PE_BUILD_DOWNLOAD_ROOT']
+  config.ssh.insert_key = false
+
+  config.vm.define 'pe-latest-master' do |node|
+    node.vm.hostname = 'pe-latest-master.pe-bootstrap.vlan'
+    node.vm.box      = 'centos'
+    # All-in-one master nodes need a generous amount of RAM for all the Java.
+    set_resources node, 4096, 1
+    node.vm.provision :shell, :inline => "service iptables stop || true\niptables -F || true"
+
+    node.vm.network 'private_network', :ip => '10.20.1.106'
+    node.vm.provision :shell, :inline => 'echo "10.20.1.107 pe-latest-agent.pe-bootstrap.vlan" >> /etc/hosts'
+
+    node.vm.provision :pe_bootstrap do |p|
+      p.version_file = 'LATEST'
+      p.role = :master
+      # Set autosign to false so that we can test pe_agent functionality.
+      p.autosign = false
+      # Tune memory usage down.
+      p.answer_extras = [<<-EOS
+"puppet_enterprise::master::puppetserver::jruby_max_active_instances": 1
+"puppet_enterprise::profile::master::java_args": {
+  "Xmx": "384m",
+  "Xms": "128m",
+  "XX:+UseG1GC": ""
+}
+
+"puppet_enterprise::puppetdb::command_processing_threads": 1
+"puppet_enterprise::profile::puppetdb::java_args": {
+  "Xmx": "128m",
+  "Xms": "64m",
+  "XX:+UseG1GC": ""
+}
+"puppet_enterprise::profile::console::java_args": {
+  "Xmx": "64m"
+  "Xms": "64m"
+  "XX:+UseG1GC": ""
+}
+"puppet_enterprise::profile::database::shared_buffers": "4MB"
+"puppet_enterprise::profile::orchestrator::java_args": {
+  "Xmx": "64m",
+  "Xms": "64m",
+  "XX:+UseG1GC": ""
+}
+EOS
+      ]
+    end
+  end
+
+  config.vm.define 'pe-latest-agent' do |node|
+    node.vm.hostname = 'pe-latest-agent.pe-bootstrap.vlan'
+    node.vm.box      = 'ubuntu'
+
+    node.vm.network 'private_network', :ip => '10.20.1.107'
+    node.vm.provision :shell, :inline => 'echo "10.20.1.106 pe-latest-master.pe-bootstrap.vlan" >> /etc/hosts'
+
+    node.vm.provision :pe_agent do |p|
+      p.master_vm = 'pe-latest-master'
+    end
+  end
+end

data/lib/pe_build/release/2016_4.rb

@@ -38,4 +38,6 @@ module PEBuild::Release
   @releases['2016.4.9'] = twentysixteen_four_x
   @releases['2016.4.10'] = twentysixteen_four_x
   @releases['2016.4.11'] = twentysixteen_four_x
+  # RIP. 2016.4.12
+  @releases['2016.4.13'] = twentysixteen_four_x
 end

data/lib/pe_build/release/2017_3.rb

@@ -32,4 +32,6 @@ module PEBuild::Release
   @releases['2017.3.4'] = twentyseventeen_three_x
   @releases['2017.3.5'] = twentyseventeen_three_x
   @releases['2017.3.6'] = twentyseventeen_three_x
+  # RIP. 2017.3.7
+  @releases['2017.3.8'] = twentyseventeen_three_x
 end

data/lib/pe_build/release/2018_1.rb

@@ -28,4 +28,6 @@ module PEBuild::Release
   end
 
   @releases['2018.1.0'] = twentyeighteen_one_x
+  # RIP. 2018.1.1
+  @releases['2018.1.2'] = twentyeighteen_one_x
 end

data/lib/pe_build/version.rb

@@ -1,3 +1,3 @@
 module PEBuild
-  VERSION = '0.17.12'.freeze
+  VERSION = '0.17.13'.freeze
 end

data/spec/shared/helpers/webserver_context.rb

@@ -17,6 +17,7 @@ shared_context 'webserver' do
 
     @server = WEBrick::HTTPServer.new(
       AccessLog: [],
+      BindAddress: '127.0.0.1',
       Port: webserver_port,
       DocumentRoot: webserver_path,
       MimeTypes: mime_types)

data/spec/spec_helper.rb

@@ -1,8 +1,9 @@
-$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 # Disable Vagrant autoloading so that other plugins defined in the Gemfile for
 # Acceptance tests are not loaded.
 ENV['VAGRANT_NO_PLUGINS'] = '1'
+ENV['VAGRANT_DISABLE_PLUGIN_INIT'] = '1'
 
 require 'vagrant-spec/unit'
 require 'pe_build'

data/tasks/acceptance.rake

@@ -1,7 +1,7 @@
 namespace :acceptance do
   ARTIFACT_DIR = File.join('acceptance', 'artifacts')
   TEST_BOXES = {
-    'centos-virtualbox.box' => 'https://s3.amazonaws.com/puppetlabs-vagrantcloud/centos-6.6-x86_64-virtualbox-nocm-1.0.3.box',
+    'centos-virtualbox.box' => 'https://s3.amazonaws.com/puppetlabs-vagrantcloud/centos-7.2-x86_64-virtualbox-nocm-1.0.1.box',
     'ubuntu-virtualbox.box' => 'https://s3.amazonaws.com/puppetlabs-vagrantcloud/ubuntu-14.04-x86_64-virtualbox-nocm-1.0.3.box'
   }
 

data/vagrant-pe_build.gemspec

@@ -22,6 +22,4 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'minitar', '~> 0.6.1'
 
   gem.add_development_dependency 'rake', '~> 10.0'
-  # Pin to 2.14.x for compatibility with vagrant-spec.
-  gem.add_development_dependency 'rspec', '~> 2.14.0'
 end

data/vagrant-spec.config.example.rb

@@ -1,5 +1,12 @@
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+
+# Prevent tests from attempting to load plugins from a Vagrant install
+# that may exist on the host system. We load required plugins below.
+ENV['VAGRANT_DISABLE_PLUGIN_INIT'] = '1'
+
 require 'pathname'
 require 'vagrant-spec/acceptance'
+require 'vagrant-pe_build'
 
 require_relative 'spec/shared/helpers/webserver_context'
 
@@ -13,7 +20,7 @@ Vagrant::Spec::Acceptance.configure do |c|
     boxes: Dir[acceptance_dir + 'artifacts' + '*-virtualbox.box'],
     # This folder should be filled with PE tarballs for CentOS.
     archive_path: (acceptance_dir + 'artifacts' + 'pe_archives').to_s,
-    pe_latest: '2016.2.0',
+    pe_latest: '2018.1.0',
     env_vars: {
       'VBOX_USER_HOME' => '{{homedir}}',
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-pe_build
 version: !ruby/object:Gem::Version
-  version: 0.17.12
+  version: 0.17.13
 platform: ruby
 authors:
 - Adrien Thebo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-02 00:00:00.000000000 Z
+date: 2018-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
@@ -53,20 +53,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.14.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.14.0
 description: 
 email:
 - adrien@somethingsinistral.net
@@ -86,12 +72,15 @@ files:
 - Rakefile
 - acceptance/pe_build/pe_bootstrap_2015x_spec.rb
 - acceptance/pe_build/pe_bootstrap_2016x_spec.rb
+- acceptance/pe_build/pe_bootstrap_2018x_spec.rb
 - acceptance/pe_build/pe_bootstrap_3x_spec.rb
 - acceptance/pe_build/pe_bootstrap_latest_spec.rb
 - acceptance/pe_build/pe_build_cli_spec.rb
 - acceptance/skeletons/2015x_acceptance/Vagrantfile
 - acceptance/skeletons/2016x_acceptance/Vagrantfile
-- acceptance/skeletons/pe_build/Vagrantfile
+- acceptance/skeletons/2018x_acceptance/Vagrantfile
+- acceptance/skeletons/3x_acceptance/Vagrantfile
+- acceptance/skeletons/pe_latest_acceptance/Vagrantfile
 - data/vagrant-pe_build/files/GPG-KEY-puppetlabs
 - doc/answers/README.markdown
 - doc/answers/agent.txt