beaker-pe 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 654d86ee8406653cab9f8283d689e307036d1b06
-  data.tar.gz: e5d74a9c791c3b8fdf87c9febab261c2a9145b28
+  metadata.gz: 2a2d9c6c78aa9f221e4b2bb52d491706c289ba2d
+  data.tar.gz: 047895154080e79a127ddcfc6ce1472933c63e45
 SHA512:
-  metadata.gz: 083bcb7ef52f8259f645cb65fd18ad62a2478ca27d724fb903abd0419213c7e4e2611295784a0906e41692c6a59e5ffb340e4e5a4c3be18a856e4870ab2ec1de
-  data.tar.gz: 98e2044e16bc44b3667bfcd27d6897bdf4a547d54ec00f7dca13e33f6f696fac68afc32112a825f5042fe23e513514c5d799a873093156f09d444ef747e4629e
+  metadata.gz: 887d9e30921f79f80dc9f841584164077f6d3b56622d6fb85d4618409446f81892bcfd8acdf50711bbb519e8e76a17f3f1d9f032e5cf17d5dbe54a61703a364c
+  data.tar.gz: 04321b38d606f86326a9054bd539b03ba088f9708a536c0a5379c89700c8896019783c2377b885e13f418f07ba70ce8841c2c163166f2b5fa30f8e096ab5cc6f

data/lib/beaker-pe/pe-client-tools/install_helper.rb

@@ -51,65 +51,11 @@ module Beaker
           end
         end
 
-        # Taken from puppet acceptance lib
-        # Install development repos
+        # `install_dev_repos_on` is used in various projects in the puppetlabs namespace;
+        # when they are all switched to call `install_puppetlabs_dev_repo`, this method
+        # can be removed.
         def install_dev_repos_on(package, host, sha, repo_configs_dir, opts={})
-          platform = host['platform'] =~ /^(debian|ubuntu)/ ? host['platform'].with_version_codename : host['platform']
-          platform_configs_dir = File.join(repo_configs_dir, platform)
-
-          case platform
-            when /^(fedora|el|centos|sles)-(\d+)-(.+)$/
-              variant = (($1 == 'centos') ? 'el' : $1)
-              fedora_prefix = ((variant == 'fedora') ? 'f' : '')
-              version = $2
-              arch = $3
-
-              pattern = 'pl-%s-%s-%s-%s%s-%s.repo'
-
-              repo_filename = pattern % [
-                  package,
-                  sha,
-                  variant,
-                  fedora_prefix,
-                  version,
-                  arch
-              ]
-
-              repo = fetch_http_file(
-                  "%s/%s/%s/repo_configs/rpm/" % [opts[:dev_builds_url],package, sha],
-                  repo_filename,
-                  platform_configs_dir
-              )
-
-              if /sles/i.match(platform)
-                scp_to(host, repo, '/etc/zypp/repos.d/')
-              else
-                scp_to(host, repo, '/etc/yum.repos.d/')
-              end
-
-            when /^(debian|ubuntu)-([^-]+)-(.+)$/
-              variant = $1
-              version = $2
-              arch = $3
-
-              list = fetch_http_file(
-                  "%s/%s/%s/repo_configs/deb/" % [opts[:dev_builds_url],package, sha],
-                  "pl-%s-%s-%s.list" % [package, sha, version],
-                  platform_configs_dir
-              )
-
-              scp_to host, list, '/etc/apt/sources.list.d'
-              # Ubuntu platform gets host['platform'].with_version_codename (see line 57)
-              if variant == 'ubuntu' && version == 'bionic'
-                apt_conf_content = 'Acquire::AllowInsecureRepositories "true";'
-              else
-                apt_conf_content = 'APT::Get::AllowUnauthenticated "true";'
-              end
-              create_remote_file(host, '/etc/apt/apt.conf.d/99trust-all', apt_conf_content)
-              on host, 'apt-get update'
-            else
-              host.logger.notify("No repository installation step for #{platform} yet...")
-          end
+          install_puppetlabs_dev_repo(host, package, sha, repo_configs_dir, opts)
         end
       end
     end

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '2.1.5'
+        STRING = '2.1.6'
       end
 
     end

data/spec/beaker-pe/pe-client-tools/installer_helper_spec.rb

@@ -31,7 +31,13 @@ describe ClassPEClientToolsMixedWithPatterns do
       let(:platform) { Beaker::Platform.new('el-6-x86_64') }
       it 'installs' do
         hosts.each do |host|
-          allow(subject). to receive(:fetch_http_file).with("http://builds.delivery.puppetlabs.net/pe-client-tools/#{opts[:pe_client_tools_sha]}/repo_configs/rpm/", "pl-pe-client-tools-#{opts[:pe_client_tools_sha]}-el-6-x86_64.repo", "/tmp/repo_configs/el-6-x86_64")
+          expect(subject).to receive(:install_puppetlabs_dev_repo).with(
+            host,
+            'pe-client-tools',
+            opts[:pe_client_tools_sha],
+            '/tmp/repo_configs',
+            dev_builds_url: 'http://builds.delivery.puppetlabs.net'
+          )
           expect(host).to receive(:install_package).with("pe-client-tools")
 
           subject.install_pe_client_tools_on(host, opts)
@@ -40,7 +46,13 @@ describe ClassPEClientToolsMixedWithPatterns do
 
       it 'installs tag versions correctly' do
         hosts.each do |host|
-          allow(subject). to receive(:fetch_http_file).with("http://builds.delivery.puppetlabs.net/pe-client-tools/#{tag_opts[:pe_client_tools_version]}/repo_configs/rpm/", "pl-pe-client-tools-#{tag_opts[:pe_client_tools_version]}-el-6-x86_64.repo", "/tmp/repo_configs/el-6-x86_64")
+          expect(subject).to receive(:install_puppetlabs_dev_repo).with(
+            host,
+            'pe-client-tools',
+            tag_opts[:pe_client_tools_version],
+            '/tmp/repo_configs',
+            dev_builds_url: 'http://builds.delivery.puppetlabs.net'
+          )
           expect(host).to receive(:install_package).with("pe-client-tools")
 
           subject.install_pe_client_tools_on(host, tag_opts)
@@ -52,8 +64,13 @@ describe ClassPEClientToolsMixedWithPatterns do
       let(:platform) { Beaker::Platform.new('ubuntu-1604-x86_64') }
       it 'installs' do
         hosts.each do |host|
-          allow(subject). to receive(:fetch_http_file).with("http://builds.delivery.puppetlabs.net/pe-client-tools/#{opts[:pe_client_tools_sha]}/repo_configs/deb/", "pl-pe-client-tools-#{opts[:pe_client_tools_sha]}-xenial.list", "/tmp/repo_configs/ubuntu-xenial-x86_64")
-          expect(subject).to receive(:on).with(host, 'apt-get update')
+          expect(subject).to receive(:install_puppetlabs_dev_repo).with(
+            host,
+            'pe-client-tools',
+            opts[:pe_client_tools_sha],
+            '/tmp/repo_configs',
+            dev_builds_url: 'http://builds.delivery.puppetlabs.net'
+          )
           expect(host).to receive(:install_package).with('pe-client-tools')
 
           subject.install_pe_client_tools_on(host, opts)
@@ -62,8 +79,13 @@ describe ClassPEClientToolsMixedWithPatterns do
 
       it 'installs tag versions correctly' do
         hosts.each do |host|
-          allow(subject). to receive(:fetch_http_file).with("http://builds.delivery.puppetlabs.net/pe-client-tools/#{tag_opts[:pe_client_tools_version]}/repo_configs/deb/", "pl-pe-client-tools-#{tag_opts[:pe_client_tools_version]}-xenial.list", "/tmp/repo_configs/ubuntu-xenial-x86_64")
-          expect(subject).to receive(:on).with(host, 'apt-get update')
+          expect(subject).to receive(:install_puppetlabs_dev_repo).with(
+            host,
+            'pe-client-tools',
+            tag_opts[:pe_client_tools_version],
+            '/tmp/repo_configs',
+            dev_builds_url: 'http://builds.delivery.puppetlabs.net'
+          )
           expect(host).to receive(:install_package).with('pe-client-tools')
 
           subject.install_pe_client_tools_on(host, tag_opts)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2019-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec