beaker-puppet 1.18.2 → 1.18.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bddae021974d38725e210d663444a466d7ca34d
-  data.tar.gz: 82fb093d087111109630e6c5cd2eb09cd14ee756
+  metadata.gz: b54c4287a80e22ffd30f5a96d7a11b74d300344b
+  data.tar.gz: fe37eed2b606c9848c7f115c769f468716449faf
 SHA512:
-  metadata.gz: ccdf72c3ec1c3dee8b7c19684c49b9ca22296032738443bad168b020c55e45dc96578e31f174eb8411ed2a76e9034841a6304e50845df5512b7ff03428d1bd8b
-  data.tar.gz: f9e7bde883253c36e29223a5f4eeb6ad499ddbefb846fc71592d6c7847ab936e487969db7cf642230539e54bf99ff0f98fdbfa16708113510fc70d3635155bbe
+  metadata.gz: 9e8fb91f8776ce8849a48d490861ca1b76171a73f30f04908872ab07acc57e9a145c30ea588e117b08fc5bf457bb9e926968faac7d1dc70b72ed2e3590dc05b1
+  data.tar.gz: a59b3c974bfb563e87702b7999ef21a77982a376dbb0e1baed39beaf22811ac70789a3836de04d6d278a0db0f488787518242cc7d8321ecddd1a4739e71b4901

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

@@ -37,7 +37,7 @@ module Beaker
         # @param [Hash] the original options to be merged with the default options
         #
         # @return [Hash] The finalized set of options
-        def sanatize_opts(opts)
+        def sanitize_opts(opts)
           # If any of the nightly urls are not set, but the main `:nightly_builds_url`
           # is set, we should overwrite anything not set.
           opts[:nightly_apt_repo_url]     ||= opts[:nightly_builds_url]
@@ -288,7 +288,7 @@ module Beaker
         # @raise [StandardError] When encountering an unsupported platform by default, or if gem cannot be found when default_action => 'gem_install'
         # @raise [FailTest] When error occurs during the actual installation process
         def install_puppet_on(hosts, opts = options)
-          opts = sanatize_opts(opts)
+          opts = sanitize_opts(opts)
 
           # If version isn't specified assume the latest in the 3.x series
           if opts[:version] and not version_is_less(opts[:version], '4.0.0')
@@ -375,7 +375,7 @@ module Beaker
         # @raise [StandardError] When encountering an unsupported platform by default, or if gem cannot be found when default_action => 'gem_install'
         # @raise [FailTest] When error occurs during the actual installation process
         def install_puppet_agent_on(hosts, opts = {})
-          opts = sanatize_opts(opts)
+          opts = sanitize_opts(opts)
           opts[:puppet_agent_version] ||= opts[:version] #backwards compatability with old parameter name
           opts[:puppet_collection] ||= puppet_collection_for(:puppet_agent, opts[:puppet_agent_version]) || 'pc1'
 
@@ -998,7 +998,7 @@ module Beaker
           block_on hosts do |host|
             variant, version, arch, codename = host['platform'].to_array
             repo_name = repo || opts[:puppet_collection] || 'puppet'
-            opts = sanatize_opts(opts)
+            opts = sanitize_opts(opts)
 
             case variant
             when /^(fedora|el|redhat|centos|sles|cisco_nexus|cisco_ios_xr)$/
@@ -1107,6 +1107,12 @@ module Beaker
             copy_dir
           )
 
+          if host['platform'].variant =~ /^(ubuntu|debian)$/
+            # Bypass signing checks on this repo and its packages
+            contents = File.read(repo).gsub(/^deb /, "deb [trusted=yes] ")
+            File.write(repo, contents)
+          end
+
           if host[:platform] =~ /cisco_nexus/
             to_path = "#{host.package_config_dir}/#{File.basename(repo)}"
           else
@@ -1114,12 +1120,6 @@ module Beaker
           end
           scp_to( host, repo, to_path )
 
-          variant, version, arch, codename = host['platform'].to_array
-          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-/
           nil
         end
@@ -1156,7 +1156,7 @@ module Beaker
           repo_configs_dir ||= 'tmp/repo_configs'
 
           platform_configs_dir = File.join(repo_configs_dir, variant)
-          opts = sanatize_opts(opts)
+          opts = sanitize_opts(opts)
 
           # some of the uses of dev_builds_url below can't include protocol info,
           # plus this opens up possibility of switching the behavior on provided
@@ -1165,11 +1165,6 @@ module Beaker
           dev_builds_url = protocol + hostname
           dev_builds_url = opts[:dev_builds_url] if variant =~ /^(fedora|el|redhat|centos)$/
 
-          if variant =~ /^ubuntu$/ && version.split('.').first.to_i >= 18
-            # Allow the use of unsigned repos with Ubuntu 18.04+
-            on host, "echo 'Acquire::AllowInsecureRepositories \"true\";' > /etc/apt/apt.conf.d/90insecure"
-          end
-
           install_repo_configs( host, dev_builds_url, package_name,
                                 build_version, platform_configs_dir )
 
@@ -1250,7 +1245,7 @@ module Beaker
             # you could provide any values you could to one to the other
             puppet_agent_version = opts[:puppet_agent_sha] || opts[:puppet_agent_version]
 
-            opts = sanatize_opts(opts)
+            opts = sanitize_opts(opts)
             opts[:download_url] = "#{opts[:dev_builds_url]}/puppet-agent/#{ puppet_agent_version }/repos/"
             opts[:copy_base_local]    ||= File.join('tmp', 'repo_configs')
             opts[:puppet_collection]  ||= 'PC1'
@@ -1349,7 +1344,7 @@ module Beaker
 
           block_on hosts do |host|
             pe_ver = host[:pe_ver] || opts[:pe_ver] || '4.0.0-rc1'
-            opts = sanatize_opts(opts)
+            opts = sanitize_opts(opts)
             opts[:download_url] = "#{opts[:pe_promoted_builds_url]}/puppet-agent/#{ pe_ver }/#{ opts[:puppet_agent_version] }/repos"
             opts[:copy_base_local]    ||= File.join('tmp', 'repo_configs')
             opts[:copy_dir_external]  ||= host.external_copy_base
@@ -1428,7 +1423,7 @@ module Beaker
         # @option opts [String] :dev_builds_url Custom internal builds URL.
         #     Defaults to {DEFAULT_DEV_BUILDS_URL}.
         def install_puppetserver_on(host, opts = {})
-          opts = sanatize_opts(opts)
+          opts = sanitize_opts(opts)
 
           # Default to installing latest from nightlies
           opts[:version] ||= 'latest'

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '1.18.2'
+  VERSION = '1.18.3'
 end

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

@@ -71,7 +71,7 @@ describe ClassMixedWithDSLInstallUtils do
 
   let(:win_temp)      { 'C:\\Windows\\Temp' }
 
-  context '#sanatize_opts' do
+  context '#sanitize_opts' do
     let(:opts) {
       {
         :win_download_url => nil,
@@ -81,21 +81,21 @@ describe ClassMixedWithDSLInstallUtils do
     }
 
     it 'honors any custom values' do
-      expect( subject.sanatize_opts(opts)).to include({release_yum_repo_url: 'https://apt.customserver.net/apt'})
+      expect( subject.sanitize_opts(opts)).to include({release_yum_repo_url: 'https://apt.customserver.net/apt'})
     end
 
     it 'overwrites any nil values with pre-defined defaults' do
       default_win_url = described_class::FOSS_DEFAULT_DOWNLOAD_URLS[:win_download_url]
-      expect( subject.sanatize_opts(opts)).to include({win_download_url: default_win_url})
+      expect( subject.sanitize_opts(opts)).to include({win_download_url: default_win_url})
     end
 
     it 'keeps empty strings' do
-      expect( subject.sanatize_opts(opts)).to include({dev_builds_url: ''})
+      expect( subject.sanitize_opts(opts)).to include({dev_builds_url: ''})
     end
 
     it 'adds any undefined defaults' do
       default_mac_url = described_class::FOSS_DEFAULT_DOWNLOAD_URLS[:mac_download_url]
-      expect( subject.sanatize_opts(opts)).to include({mac_download_url: default_mac_url})
+      expect( subject.sanitize_opts(opts)).to include({mac_download_url: default_mac_url})
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 1.18.2
+  version: 1.18.3
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-20 00:00:00.000000000 Z
+date: 2019-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec