beaker-puppet 1.16.0 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f195bb6d82d2cf6a4cb6ff976c15df17f54b3e0f
-  data.tar.gz: 00e7a6b8fd9a31a78d545f88bbe912980be3d0e9
+  metadata.gz: 59253ab3e53433cc50aa11fce2564472db5e2293
+  data.tar.gz: df4b8cecf947cb8bd9681ca6cd2ece5225a6882c
 SHA512:
-  metadata.gz: ea339a35f641981d7e9d4ad068a6cde85440f9e89402ecbd9b3410bf6d51bd76e2ff5d611eb31d5fd852f4635051a0d153cb33f882b008f5bb8d19de2f12ca13
-  data.tar.gz: cae6d89f572103b163d308a38948cea7dfb4b96467e4df93eb1b676ff83db440bf6ef51c39596a6badac38fdf2703f27d0f66a2e7cdf6a0a466c0545fa6b54a3
+  metadata.gz: 53bc876e2ac0677b22c564b163affc710c23b5ce27907e26354eaaa2d9c71b9f93dd9306a946b92d41de952f878985e6bb6a9618c6fe98326f626f3a93acbbbb
+  data.tar.gz: 2828b53c02ca4c9111d06581c370e34dd985e0cd0080004be9e4f163f8d90b3d75758593c411f42c67d7811e4652de1e3ed9110b88777f8c313b6324a18a8711

data/acceptance/pre_suite/pkg/install.rb

@@ -2,10 +2,12 @@ require 'beaker-puppet'
 
 # the version is required on windows
 # all versions are required for osx
-install_puppet({
-  :version        => ENV['BEAKER_PUPPET_VERSION'] || '4.8.0',
-  :puppet_agent_version => ENV['BEAKER_PUPPET_AGENT_VERSION'] || '1.8.0'
-})
+hosts.each do |host|
+  install_puppet_on(host, {
+    :version        => ENV['BEAKER_PUPPET_VERSION'] || '5.5.13',
+    :puppet_agent_version => ENV['BEAKER_PUPPET_AGENT_VERSION'] || '5.5.13'
+  })
 
-on(master, puppet('resource user puppet ensure=present'))
-on(master, puppet('resource group puppet ensure=present'))
+  on(host, puppet('resource user puppet ensure=present'))
+  on(host, puppet('resource group puppet ensure=present'))
+end

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

@@ -401,7 +401,7 @@ module Beaker
             end
 
             if package_name
-              install_puppetlabs_release_repo( host, opts[:puppet_collection] )
+              install_puppetlabs_release_repo( host, opts[:puppet_collection] , opts)
               host.install_package( package_name )
             end
           end
@@ -1089,8 +1089,9 @@ module Beaker
           scp_to( host, repo, to_path )
 
           variant, version, arch, codename = host['platform'].to_array
-          if variant =~ /^ubuntu$/ && version.split('.').first.to_i >= 18
-            # Allow the use of unsigned repos with Ubuntu 18.04+
+          if (variant =~ /^ubuntu$/ && version.split('.').first.to_i >= 18) ||
+              (variant =~ /^debian$/ && version.split('.').first.to_i >= 10)
+            # Allow the use of unsigned repos with Ubuntu 18.04+ and for Debian 10 +
             on host, "echo 'Acquire::AllowInsecureRepositories \"true\";' > /etc/apt/apt.conf.d/90insecure"
           end
           on( host, 'apt-get update' ) if host['platform'] =~ /ubuntu-|debian-|cumulus-|huaweios-/

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

@@ -16,7 +16,7 @@ module Beaker
         # The directories in the module directory that will not be scp-ed to the test system when using
         # `copy_module_to`
         PUPPET_MODULE_INSTALL_IGNORE = ['.bundle', '.git', '.idea', '.vagrant', '.vendor', 'vendor', 'acceptance',
-                                        'bundle', 'spec', 'tests', 'log', '.svn', 'junit', 'pkg', 'example']
+                                        'bundle', 'spec', 'tests', 'log', '.svn', 'junit', 'pkg', 'example', 'tmp']
 
         # Install the desired module on all hosts using either the PMT or a
         #   staging forge

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '1.16.0'
+  VERSION = '1.17.0'
 end

data/setup/aio/010_Install_Puppet_Agent.rb

@@ -1,10 +1,23 @@
 test_name "Install Packages" do
 
   dev_builds_url  = ENV['DEV_BUILDS_URL'] || 'http://builds.delivery.puppetlabs.net'
+  nightly_builds_url = ENV['NIGHTLY_BUILDS_URL'] || 'http://nightlies.puppet.com'
+
+  sha = ENV['SHA']
+  release_stream = ENV['RELEASE_STREAM'] || 'puppet'
 
   step "Install puppet-agent..." do
-    sha = ENV['SHA']
-    install_from_build_data_url('puppet-agent', "#{dev_builds_url}/puppet-agent/#{sha}/artifacts/#{sha}.yaml", hosts)
+    # If SHA='latest', then we're installing from nightlies
+    if sha == 'latest'
+      opts = {
+        :release_yum_repo_url => nightly_builds_url + '/yum',
+        :release_apt_repo_url => nightly_builds_url + '/apt',
+        :puppet_collection => "#{release_stream}-nightly"
+      }
+      install_puppet_agent_on(hosts, opts)
+    else
+      install_from_build_data_url('puppet-agent', "#{dev_builds_url}/puppet-agent/#{sha}/artifacts/#{sha}.yaml", hosts)
+    end
   end
 
   # make sure install is sane, beaker has already added puppet and ruby

data/setup/git/000_EnvSetup.rb

@@ -88,10 +88,6 @@ step "Unpack puppet-runtime" do
 
   agents.each do |host|
 
-    # If we're running on an agent, assume the user has set an image that
-    # already contains everything we would get from the runtime tarball.
-    next if host[:hypervisor] == 'docker'
-
     platform_tag = host['packaging_platform']
     if platform_tag =~ /windows/
       # the windows version is hard coded to `2012r2`. Unfortunately,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.17.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-29 00:00:00.000000000 Z
+date: 2019-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec