beaker-puppet 0.13.5 → 0.13.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cca1d57bd1c5a2a3fa77787a878ab3053ee09516
-  data.tar.gz: 112ffe35c2a225167dcb9595c14a04e1ecd1653c
+  metadata.gz: df06b95e2751286b63fef798fecc7ce8d49114a7
+  data.tar.gz: ad920228d116a92b4f604f2457d2f8472f646838
 SHA512:
-  metadata.gz: dd6fd41e1779ada512ceaa7f34afb40d93871e533c80d77e298d48ba6d89d505cde488eb864645015dd0dce29ba0f1740f231fbbb77528bdc30f600f019cf6f7
-  data.tar.gz: 50249278eaf41ccad9d7e275fd37ba729021ee686091ef1bea86e76ba29d11cf82e8b8bd9727a38e4ab1c9aa676c4a7e1733f3cf61587fccfc1124fee38b9311
+  metadata.gz: 05778ac1d1f1cf7f0de41b7f7d478a99459e830859247c71a54c2a3c2049c35f5a35cb9962ed818e81549f2240bc9c12c3f4a3bfdde11e4323808e1701010f5d
+  data.tar.gz: bdab4921bc52af5669f5efe29fb59ce081bf25748fbaffef9575dd1fbca7fa652c75de4cf9a9b69ca33fa438df09c4b441e736ceb3570e78d9200af68c0f5c55

data/lib/beaker-puppet/install_utils/puppet5.rb

@@ -103,7 +103,11 @@ module BeakerPuppet
           onhost_package_file = "#{project_name}*"
           host.install_local_package(onhost_package_file)
         when 'windows'
-          generic_install_msi_on(host, artifact_url)
+          if project_name == 'puppet-agent'
+            install_msi_on(host, artifact_url)
+          else
+            generic_install_msi_on(host, artifact_url)
+          end
         when 'aix'
           artifact_filename = File.basename(artifact_url)
           artifact_folder = File.dirname(artifact_url)

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '0.13.5'
+  VERSION = '0.13.6'
 end

data/setup/common/040_ValidateSignCert.rb

@@ -14,26 +14,27 @@ test_name "Validate Sign Cert" do
   step "Clear SSL on all hosts"
   hosts.each do |host|
     ssldir = on(host, puppet('agent --configprint ssldir')).stdout.chomp
+    # preserve permissions for master's ssldir so puppetserver can read it
     on(host, "rm -rf '#{ssldir}/*'")
   end
 
-  step "Master: Start Puppet Master" do
+  step "Start puppetserver" do
     master_opts = {
       :main => {
         :dns_alt_names => "puppet,#{hostname},#{fqdn}",
       },
     }
+    # server will generate the CA and server certs when it starts
     with_puppet_running_on(master, master_opts) do
-
-      hosts.each do |host|
-        next if host['roles'].include? 'master'
+      agents.each do |agent|
+        next if agent == master
 
         step "Agents: Run agent --test first time to gen CSR"
-        on host, puppet("agent --test --server #{master}"), :acceptable_exit_codes => [1]
+        on agent, puppet("agent --test --server #{master}"), :acceptable_exit_codes => [1]
       end
 
-      # Sign all waiting certs
-      step "Master: sign all certs"
+      # Sign all waiting agent certs
+      step "Server: sign all agent certs"
       on master, puppet("cert --sign --all"), :acceptable_exit_codes => [0,24]
 
       step "Agents: Run agent --test second time to obtain signed cert"

data/spec/beaker-puppet/install_utils/puppet5_spec.rb

@@ -169,6 +169,14 @@ describe ClassMixedWithDSLInstallUtils do
       subject.install_artifact_on(host, artifact_url, 'project_name')
     end
 
+    it 'install a puppet-agent MSI from a URL on Windows' do
+      @platform = 'windows'
+
+      expect(subject).to receive(:install_msi_on).with(host, artifact_url)
+
+      subject.install_artifact_on(host, artifact_url, 'puppet-agent')
+    end
+
     it 'install an MSI from a URL on Windows' do
       @platform = 'windows'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 0.13.5
+  version: 0.13.6
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2018-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec