beaker-pe 0.11.0 → 0.12.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODUzMGQyOGI1YjVjNmY4YTg5M2NhYWVkMzc0YzZiZWU3ZGY5N2UyYQ==
+    NTgyNDMxM2NlZDBlZTFiZGFlNjQ1NzQ3ZGI4NDVmZDI0NDBiNDE2OQ==
   data.tar.gz: !binary |-
-    ZWJmYTZkZTNhN2YzODBjYTNkNmUyZDE3MmY0MGZhMGNlNTgwNjYyZg==
+    MDQzMmYxMmNjY2RlMzM0YzhlZWMyYjJmMmVkNzZlZmYwYzUyYTNmYw==
 SHA512:
   metadata.gz: !binary |-
-    NmE2MzA1OTAyYWYyMDNhNjFjYzE1Y2MxMzczZmVmZDk4NTc0ZDAwZmQwZmNi
-    NTE1NGQ2NDdiNjgxMmNiZWRlZWY1NTBhMzlhZTBlODFmZDYwMTBkMmU1ZGJj
-    YmIwZTJmYTE3NWFjNTNiMWIzYjgwZmE5OGZmMDQ4YTI4ZGY2N2Y=
+    ZTZkNGFkYmQ1ZTE3OTA5YWEwYzJiYzA0ODc3ODg2YTYzMjk2YmQ0ZTVmM2Rl
+    YjhhYTI1MjY3MTUzYzZmNGQzYThjYmYwMjRhOTYzZWRmMDdkNGIyNjg1ZjY2
+    MjNjZmFlYzUxODU0NTc4MjljNTllZmQ0Nzg2ODMxNGFiZTQxZjE=
   data.tar.gz: !binary |-
-    NDI4YzU1Mzk0Yjc0ODRhNjM0YzYxY2Q5NTk4NWE0YzQ1ZGE0ZDViOTExMjI4
-    ZDMwNDQ4ZjE1NDVhYTllNThmZGY0ZjNjNWMyZjY5ZTAzNDkxMzZjNGNjNzky
-    ZTlkOWY5ZDY0NGEwYjAyMGE5MmQ3NTlhNGY3OThiZGUzOGE4NjI=
+    MzA5YzcwMGVkMDZmMDU3NjMzNTdkODQ1MjgwODY5NTFkMDQ4ZDAwMzQ2NWI2
+    ODhlN2FiMGZiYTgzODM2YjhkYjU0ZjJhYzNhZWI2MzkzZjNiZmRlMjQ2ZmFj
+    OGZmZDljMTA0MzgzYjQxYzQxZTAwMTg4OGQxMDAyNzIzMDYwOGM=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 25 Aug, 2016 (ca260aa0)](#LATEST)
+* [LATEST - 16 Sep, 2016 (d16e0bc1)](#LATEST)
+* [0.11.0 - 25 Aug, 2016 (7167f39e)](#0.11.0)
 * [0.10.1 - 24 Aug, 2016 (97adf276)](#0.10.1)
 * [0.10.0 - 23 Aug, 2016 (b8eff18f)](#0.10.0)
 * [0.9.0 - 15 Aug, 2016 (e29ed491)](#0.9.0)
@@ -16,7 +17,23 @@
 * [0.1.0 - 29 Feb, 2016 (4fc88d8c)](#0.1.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 25 Aug, 2016 (ca260aa0)
+### <a name = "LATEST">LATEST - 16 Sep, 2016 (d16e0bc1)
+
+* (GEM) update beaker-pe version to 0.12.0 (d16e0bc1)
+
+* Merge pull request #26 from zreichert/maint/master/QA-2620_fix_installation_noop_for_nix (e75cdb09)
+
+
+```
+Merge pull request #26 from zreichert/maint/master/QA-2620_fix_installation_noop_for_nix
+
+(QA-2620) update install_pe_client_tools_on to use package repo
+```
+* (QA-2620) update install_pe_client_tools_on to use package repo (665da12b)
+
+### <a name = "0.11.0">0.11.0 - 25 Aug, 2016 (7167f39e)
+
+* (HISTORY) update beaker-pe history for gem release 0.11.0 (7167f39e)
 
 * (GEM) update beaker-pe version to 0.11.0 (ca260aa0)
 

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

@@ -4,70 +4,97 @@ module Beaker
       module PEClientTools
 
         def install_pe_client_tools_on(hosts, opts = {})
-          # FIXME: accomodate production released location(s)
-          #{{{
           product = 'pe-client-tools'
           required_keys = [:puppet_collection, :pe_client_tools_sha, :pe_client_tools_version]
 
-          unless required_keys.all? { |opt| opts.keys.include?(opt) }
+          unless required_keys.all? { |opt| opts.keys.include?(opt) && opts[opt]}
             raise ArgumentError, "The keys #{required_keys.to_s} are required in the opts hash"
           end
           urls = { :dev_builds_url   => "http://builds.delivery.puppetlabs.net",
           }
 
           opts = urls.merge(opts)
-
           block_on hosts do |host|
-            package_name = nil
             variant, version, arch, codename = host['platform'].to_array
+            package_name = ''
             case host['platform']
-            when /el-|fedora|sles|centos|cisco_/
-              release_path = "#{opts[:dev_builds_url]}/#{product}/#{ opts[:pe_client_tools_sha] }/artifacts/#{variant}/#{version}/#{opts[:puppet_collection]}/#{arch}"
-              package_name = product.dup
-              package_name << "-#{opts[:pe_client_tools_version]}-1.#{variant}#{version}.#{arch}.rpm" if opts[:pe_client_tools_version]
-            when /debian|ubuntu|cumulus|huaweios/
-              release_path = "#{opts[:dev_builds_url]}/#{product}/#{ opts[:pe_client_tools_sha] }/artifacts/deb/#{codename}/#{opts[:puppet_collection]}"
-              package_name = product.dup
-              package_name << "_#{opts[:pe_client_tools_version]}-1#{host['platform'].codename}_#{arch}.deb" if opts[:pe_client_tools_version]
-            when /windows/
-              release_path = "#{opts[:dev_builds_url]}/#{product}/#{ opts[:pe_client_tools_sha] }/artifacts/#{variant}"
-              package_name = product.dup
-              package_name << "-#{opts[:pe_client_tools_version]}-x#{arch}.msi" if opts[:pe_client_tools_version]
-            when /osx/
-              release_path = "#{opts[:dev_builds_url]}/#{product}/#{ opts[:pe_client_tools_sha] }/artifacts/apple/#{version}/#{opts[:puppet_collection]}/#{arch}"
-              package_base = product.dup
-              package_base << "-#{opts[:pe_client_tools_version]}" if opts[:pe_client_tools_version]
-              package_name = package_base.dup
-              package_name << '-1' if opts[:pe_client_tools_version]
-              installer    = package_name + '-installer.pkg'
-              package_name << ".#{variant}#{version}.dmg" if opts[:pe_client_tools_version]
-            else
-              raise "install_puppet_agent_on() called for unsupported " +
-                "platform '#{host['platform']}' on '#{host.name}'"
-            end
-
-            if package_name
-              case host['platform']
-              when /windows/
+              when /win/
+                package_name << product
+                release_path = "#{opts[:dev_builds_url]}/#{product}/#{ opts[:pe_client_tools_sha] }/artifacts/#{variant}"
+                package_name << "-#{opts[:pe_client_tools_version]}-x#{arch}.msi"
                 generic_install_msi_on(host, File.join(release_path, package_name), {}, {:debug => true})
-              else
+              when /osx/
+                release_path = "#{opts[:dev_builds_url]}/#{product}/#{ opts[:pe_client_tools_sha] }/artifacts/apple/#{version}/#{opts[:puppet_collection]}/#{arch}"
+                package_base = product.dup
+                package_base << "-#{opts[:pe_client_tools_version]}"
+                package_name = package_base.dup
+                package_name << '-1' if opts[:pe_client_tools_version]
+                installer    = package_name + '-installer.pkg'
+                package_name << ".#{variant}#{version}.dmg"
                 copy_dir_local = File.join('tmp', 'repo_configs')
                 fetch_http_file(release_path, package_name, copy_dir_local)
                 scp_to host, File.join(copy_dir_local, package_name), host.external_copy_base
-
-                if host['platform'] =~ /debian|ubuntu|cumulus|huaweios/
-                  on host, "dpkg -i #{package_name}"
-                elsif host['platform'] =~ /osx/
-                  host.generic_install_dmg(package_name, package_base, installer)
-                else
-                  host.install_package( product )
-                end
-              end
+                host.generic_install_dmg(package_name, package_base, installer)
+              else
+                install_dev_repos_on(product, host, opts[:pe_client_tools_sha], '/tmp/repo_configs',{:dev_builds_url => opts[:dev_builds_url]})
+                host.install_package('pe-client-tools')
             end
           end
-          #}}}
         end
 
+        # Taken from puppet acceptance lib
+        # Install development repos
+        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'
+              on host, 'apt-get update'
+            else
+              host.logger.notify("No repository installation step for #{platform} yet...")
+          end
+        end
       end
     end
   end

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '0.11.0'
+        STRING = '0.12.0'
       end
 
     end

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

@@ -23,7 +23,7 @@ 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]}/artifacts/el/6/PC1/x86_64", "pe-client-tools-#{opts[:pe_client_tools_version]}-1.el6.x86_64.rpm", "tmp/repo_configs")
+          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")
           allow(host). to receive(:external_copy_base)
           expect(host).to receive(:install_package).with("pe-client-tools")
           subject.install_pe_client_tools_on(host, opts)
@@ -35,9 +35,10 @@ 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]}/artifacts/deb/xenial/PC1", "pe-client-tools_#{opts[:pe_client_tools_version]}-1xenial_x86_64.deb", "tmp/repo_configs")
+          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")
           allow(host). to receive(:external_copy_base)
-          expect(subject).to receive(:on).with(host, "dpkg -i pe-client-tools_#{opts[:pe_client_tools_version]}-1xenial_x86_64.deb")
+          expect(subject).to receive(:on).with(host, 'apt-get update')
+          expect(host).to receive(:install_package).with('pe-client-tools')
           subject.install_pe_client_tools_on(host, opts)
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-25 00:00:00.000000000 Z
+date: 2016-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec