beaker-puppet 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63119970a4ff392282780bb13f92325528be91fb
-  data.tar.gz: a57c6b56e7fcd890226b38a0f367fcf0e269f407
+  metadata.gz: b8255b145e80f781db25ff60741e1705eb3c7b3e
+  data.tar.gz: f4daaec756f930f3756124e3af7dca33ba965863
 SHA512:
-  metadata.gz: 3b00a0f0dc0f07137892e1ec2bb9602705008a4cb2a9ea47791304656e33619b9f47c75f6da29560c0b402a0025cef09f80999f00eda882b534a7207f9c14a2f
-  data.tar.gz: 513af1bbc7dc8b9398753aa5a3b3e5da7e6ace2e511a0c86885088a6529451272aabeef39b72f419c20adcdef7623e834be0ee606a7a957f793dc46ddd62668a
+  metadata.gz: 366e0bf4b1ef15dd623f8a7c76544ea4fc76195dd3a1b1eef9559e0ba190aedd95a05cf487ae74eddd492cb6f132abc0a056576d31dfd7ca31af96f224b9a1a0
+  data.tar.gz: 1a612e0bc6bb1181f9ee118e37aff99a95037df9b7da4976475874b0761d79e79ec177a2039d587c44bd54b2b107eff326ad079e7408cdc763bad15968a3b6b2

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

@@ -1035,6 +1035,11 @@ 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
+            # Allow the use of unsigned repos with Ubuntu 18.04+
+            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
@@ -1080,6 +1085,11 @@ module Beaker
           dev_builds_url = protocol + hostname
           dev_builds_url = opts[:dev_builds_url] if variant =~ /^(fedora|el|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 )
 
@@ -1177,10 +1187,6 @@ module Beaker
               if arch== 's390x' || host['hypervisor'] == 'ec2'
                 logger.trace("#install_puppet_agent_dev_repo_on: unsupported host #{host} for repo detected. using dev package")
               else
-                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_puppetlabs_dev_repo( host, 'puppet-agent', puppet_agent_version, nil, opts )
                 host.install_package('puppet-agent')
                 logger.trace("#install_puppet_agent_dev_repo_on: install_puppetlabs_dev_repo finished")

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '0.15.0'
+  VERSION = '0.15.1'
 end

metadata

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