beaker-pe 1.13.0 → 1.14.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTA2MWQxYmE4MDE4M2E3MzdjNzkzZWQwODc2ODRlMzJmOTFhOTE5OQ==
+    MTE4ODY4OWQzNDM5ZDEyNzVmMjY4ZTIwMzkwZjE4NjYxYTY2ZmQ3Yw==
   data.tar.gz: !binary |-
-    MDU5OTkyNTgzODI1MTFjM2Q1OGYyMGMyZWQ2ZTE2NjQxNGM0MTdlZg==
+    ZjUxMGNlNmEyNGYxZDQ1ZWJmMzVkOWIzNGJlZTI0M2Q1ODU3MmFmOA==
 SHA512:
   metadata.gz: !binary |-
-    OTZmNzgyMmMzY2ExZmRhZTE4NzAyMGZmNDU1NWMwMzhmY2RiYjNkNzcxNWI0
-    OTc2YjY2ZTU1NmI1NGJjYjJiOTRjMzQ4NTY1MjQyZDQ3YzFmOWE4ZDIzNDI3
-    MWIzOWI2NDkyM2ZhOGQwNmUzNDA0ZjFkZjViYjg5NzM5OWUwY2Q=
+    ZDhiZTQ1NThmMTQwYjlkOGVmNTM2MTdjZWFjNDQwNjEzZTUxYWY3ZmIwYzY2
+    ZGU2NmQ1YTc4MGIxZTgxZTNjNzZhOWZiNTNlOThjZTVmYjQzYmE1MjVkOTA4
+    Zjc0ZDBiYzAwNTUwZmFlYjgwNWNkZTMyNzQ1YTI1OWJjODllYzI=
   data.tar.gz: !binary |-
-    MjkyZjI3MWFjOTczOTZlNjA3OTI4MTNhMmFkODQyMmJhOTZlNDM0ZDE5YTEw
-    MWU3ZDAzYjg2ZGEyYTk2ZWI1ZWMxMmY1YjRkZTE4YzA0MjFiMDc1MDkxYjlk
-    M2EwNzM4YTNjMjNiNzk5MDk3ZDAzZDAxZTFjZGQyYjAxN2IwZWE=
+    ZTkyMWZlYTNmNDJiNWQ1OTkyZTVhMDJmNmNmMjBmZjE4NmMzODhkNTA2ODUx
+    OGQ3MzJmZDE0OTJhNjg4ZWVhYjM3MTFjZWFmOTFhYmUxMTkzM2RkMTZmNzcz
+    ODBkNTdjMjViZjc2YmQzNzdjMmU1ZmExZTg3MTAxYTBjNGQ0YWU=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # worker - History
 ## Tags
-* [LATEST - 6 Apr, 2017 (197a55dd)](#LATEST)
+* [LATEST - 10 May, 2017 (588c5ca5)](#LATEST)
+* [1.13.0 - 6 Apr, 2017 (a3c5d641)](#1.13.0)
 * [1.12.1 - 29 Mar, 2017 (fe8bbc82)](#1.12.1)
 * [1.12.0 - 23 Mar, 2017 (0784adc6)](#1.12.0)
 * [1.11.0 - 23 Mar, 2017 (6c3b0067)](#1.11.0)
@@ -36,7 +37,85 @@
 * [0.1.0 - 29 Feb, 2016 (4fc88d8c)](#0.1.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 6 Apr, 2017 (197a55dd)
+### <a name = "LATEST">LATEST - 10 May, 2017 (588c5ca5)
+
+* (GEM) update beaker-pe version to 1.14.0 (588c5ca5)
+
+* Merge pull request #69 from nicklewis/properly-install-pe-client-tools-from-tag (e162d8ed)
+
+
+```
+Merge pull request #69 from nicklewis/properly-install-pe-client-tools-from-tag
+
+(maint) Properly install pe-client-tools when using a tag version
+```
+* (maint) Properly install pe-client-tools when using a tag version (8b8e5366)
+
+
+```
+(maint) Properly install pe-client-tools when using a tag version
+
+Previously, installing pe-client-tools with a tag version would fail on
+Windows/OS X and install the wrong package on Linux.
+
+When installing pe-client-tools, we provide two options:
+- pe_client_tools_sha: the commit SHA of the version to install
+- pe_client_tools_version: the `git describe` of the version to install
+
+pe_client_tools_version is always the name of the package to install.
+But the *location* of the package differs based on whether the package
+version corresponds to a tag or not. When the package isn't a tag
+version, it's located in a directory named based on the SHA. But when it
+is a tag version, it's located in a directory named after the tag.
+
+When pe_client_tools_version was specified as a tag, we would look in
+the directory named after the SHA (which was actually from a *previous*
+build of the package, from before it was tagged) for a file named after
+the tag. That file would never be there, since we had a mismatch of
+directory and filename. For Windows and OS X, this caused a failure to
+install, because they need to know the exact filename.
+
+This case incidentally *worked* (or appeared to work) on Linux
+platforms, because they never actually refer to the package by
+filename. Instead, they install the package by setting up a repo config,
+which *is* always named after pe_client_tools_sha, and never
+pe_client_tools_version. In that case, the Linux platforms would
+actually install the previous version of the package by SHA, from before
+it had been tagged.
+
+We now properly handle the case where pe_client_tools_version is a tag,
+by using that version as the location of the file in addition to the
+filename.
+```
+* Merge pull request #66 from cthorn42/main/master/PE-20086_msi_install_method_for_2016.5.(0|1)_if_windows2008r2 (a77cf5bf)
+
+
+```
+Merge pull request #66 from cthorn42/main/master/PE-20086_msi_install_method_for_2016.5.(0|1)_if_windows2008r2
+
+(PE-20086) PE 2016.5.(0|1) should install via msi method if windows2008r2
+```
+* (PE-20086) PE 2016.5.(0|1) should install via msi method for windows2008r2 (738e6f52)
+
+
+```
+(PE-20086) PE 2016.5.(0|1) should install via msi method for windows2008r2
+
+Due to the timing of our LTS releases and our new major branches, PE 2016.5.0 and
+PE 2016.5.1 did not get the windows2008r2 powershell fix that was done in PE-18351.
+This means we need to not attempt to install fricitonlessly if it is pe 2016.5.(0|1)
+if the agent platform is windows2008r2.
+This PR adjust the install_via_msi? method and refactors the logic in there to clean
+it up a bit (it is getting tough to easily read).
+It breaks the method down to three lines:
+1. If the agent is older then PE 2016.4.0.
+2. If the agent is windows2008r2 and is less then 2016.4.3
+3. If the agent is windows2008r2 and the agent version is between 2016.4.99 and 2016.5.99.
+If any of those are true then the MSI method should be used to install the agent.
+```
+### <a name = "1.13.0">1.13.0 - 6 Apr, 2017 (a3c5d641)
+
+* (HISTORY) update beaker-pe history for gem release 1.13.0 (a3c5d641)
 
 * (GEM) update beaker-pe version to 1.13.0 (197a55dd)
 

data/lib/beaker-pe/install/pe_utils.rb

@@ -759,13 +759,16 @@ module Beaker
           Beaker::DSL::InstallUtils::FeatureFlags.new(opts).flag?(flag)
         end
 
+        # @deprecated the !version_is_less(host['pe_ver'], '3.99') can be removed once we no longer support pre 2015.2.0 PE versions
         # Check if windows host is able to frictionlessly install puppet
         # @param [Beaker::Host] host that we are checking if it is possible to install frictionlessly to
         # @return [Boolean] true if frictionless is supported and not affected by known bugs
         def install_via_msi?(host)
           #windows agents from 4.0 -> 2016.1.2 were only installable via the aio method
-          #powershell2 bug was fixed in PE 2016.4.3
-          (host['platform'] =~ /windows/ && (version_is_less(host['pe_ver'], '2016.4.0') && !version_is_less(host['pe_ver'], '3.99'))) || (host['platform'] =~ /windows-2008r2/ && (version_is_less(host['pe_ver'], '2016.4.3') && !version_is_less(host['pe_ver'], '3.99')))
+          #powershell2 bug was fixed in PE 2016.4.3, and PE 2017.1.0, but not 2016.5.z.
+          (host['platform'] =~ /windows/ && (version_is_less(host['pe_ver'], '2016.4.0') && !version_is_less(host['pe_ver'], '3.99'))) ||
+            (host['platform'] =~ /windows-2008r2/ && (version_is_less(host['pe_ver'], '2016.4.3') && !version_is_less(host['pe_ver'], '3.99'))) ||
+            (host['platform'] =~ /windows-2008r2/ && (!version_is_less(host['pe_ver'], '2016.4.99') && version_is_less(host['pe_ver'], '2016.5.99') && !version_is_less(host['pe_ver'], '3.99')))
         end
 
         # True if version is greater than or equal to MEEP_CLASSIFICATION_VERSION

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

@@ -17,14 +17,22 @@ module Beaker
           block_on hosts do |host|
             variant, version, arch, codename = host['platform'].to_array
             package_name = ''
+            # If we're installing a tagged version, then the package will be
+            # located in a directory named after the tag. Otherwise, look for
+            # it by SHA.
+            if opts[:pe_client_tools_version] =~ /^\d+(\.\d+)+$/
+              directory = opts[:pe_client_tools_version]
+            else
+              directory = opts[:pe_client_tools_sha]
+            end
             case host['platform']
               when /win/
                 package_name << product
-                release_path = "#{opts[:dev_builds_url]}/#{product}/#{ opts[:pe_client_tools_sha] }/artifacts/#{variant}"
+                release_path = "#{opts[:dev_builds_url]}/#{product}/#{directory}/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})
               when /osx/
-                release_path = "#{opts[:dev_builds_url]}/#{product}/#{ opts[:pe_client_tools_sha] }/artifacts/apple/#{version}/#{opts[:puppet_collection]}/#{arch}"
+                release_path = "#{opts[:dev_builds_url]}/#{product}/#{directory}/artifacts/apple/#{version}/#{opts[:puppet_collection]}/#{arch}"
                 package_base = product.dup
                 package_base << "-#{opts[:pe_client_tools_version]}"
                 package_name = package_base.dup
@@ -36,7 +44,7 @@ module Beaker
                 scp_to host, File.join(copy_dir_local, package_name), host.external_copy_base
                 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]})
+                install_dev_repos_on(product, host, directory, '/tmp/repo_configs',{:dev_builds_url => opts[:dev_builds_url]})
                 host.install_package('pe-client-tools')
             end
           end

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '1.13.0'
+        STRING = '1.14.0'
       end
 
     end

data/spec/beaker-pe/install/pe_utils_spec.rb

@@ -285,6 +285,22 @@ describe ClassMixedWithDSLInstallUtils do
       expect(subject.install_via_msi?(the_host)).to eq(false)
     end
 
+    it 'returns true if pe_version is 2016.5.1 and platform is windows-2008r2 bug' do
+      the_host = winhost.dup
+      the_host['roles'] = ['frictionless']
+      the_host['platform'] = 'windows-2008r2'
+      the_host['pe_ver'] = '2016.5.1'
+      expect(subject.install_via_msi?(the_host)).to eq(true)
+    end
+
+    it 'returns false if pe_version is 2017.1.0 and platform is windows-2008r2 bug' do
+      the_host = winhost.dup
+      the_host['roles'] = ['frictionless']
+      the_host['platform'] = 'windows-2008r2'
+      the_host['pe_ver'] = '2017.1.0'
+      expect(subject.install_via_msi?(the_host)).to eq(false)
+    end
+
   end
 
   describe 'higgs installer' do

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

@@ -10,14 +10,20 @@ describe ClassPEClientToolsMixedWithPatterns do
     let(:hosts) do
       make_hosts({:platform => platform })
     end
-    opts = {
-        :puppet_collection => 'PC1',
-        :pe_client_tools_sha => '12345',
-        :pe_client_tools_version => '1.0.0-g12345'
-    }
+    let(:opts) do
+      {:puppet_collection => 'PC1',
+       :pe_client_tools_sha => '12345',
+       :pe_client_tools_version => '1.0.0-g12345'}
+    end
+
+    let(:tag_opts) do
+      {:puppet_collection => 'PC1',
+       :pe_client_tools_sha => '56789',
+       :pe_client_tools_version => '1.0.0'}
+    end
 
     before do
-      allow(subject). to receive(:scp_to)
+      allow(subject).to receive(:scp_to)
     end
 
     context 'on el-6' do
@@ -25,11 +31,20 @@ describe ClassPEClientToolsMixedWithPatterns do
       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")
-          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)
         end
       end
+
+      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(host).to receive(:install_package).with("pe-client-tools")
+
+          subject.install_pe_client_tools_on(host, tag_opts)
+        end
+      end
     end
 
     context 'on ubuntu' do
@@ -37,20 +52,28 @@ describe ClassPEClientToolsMixedWithPatterns do
       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")
-          allow(host). to receive(:external_copy_base)
           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
+
+      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(host).to receive(:install_package).with('pe-client-tools')
+
+          subject.install_pe_client_tools_on(host, tag_opts)
+        end
+      end
     end
 
     context 'on windows' do
       let(:platform) { Beaker::Platform.new('windows-2012r2-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(host). to receive(:external_copy_base)
           expect(subject).to receive(:generic_install_msi_on).with( host,
                                                                    "http://builds.delivery.puppetlabs.net/pe-client-tools/#{opts[:pe_client_tools_sha]}/artifacts/windows/pe-client-tools-#{opts[:pe_client_tools_version]}-xx86_64.msi",
                                                                    {},
@@ -59,18 +82,39 @@ describe ClassPEClientToolsMixedWithPatterns do
           subject.install_pe_client_tools_on(host, opts)
         end
       end
+
+      it 'installs tag versions correctly' do
+        hosts.each do |host|
+          expect(subject).to receive(:generic_install_msi_on).with( host,
+                                                                   "http://builds.delivery.puppetlabs.net/pe-client-tools/#{tag_opts[:pe_client_tools_version]}/artifacts/windows/pe-client-tools-#{tag_opts[:pe_client_tools_version]}-xx86_64.msi",
+                                                                   {},
+                                                                   { :debug => true }
+                                                                  )
+          subject.install_pe_client_tools_on(host, tag_opts)
+        end
+      end
     end
 
     context 'on OS X' do
       let(:platform) { Beaker::Platform.new('osx-1111-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/apple/1111/PC1/x86_64", "pe-client-tools-#{opts[:pe_client_tools_version]}-1.osx1111.dmg", "tmp/repo_configs")
-          allow(host). to receive(:external_copy_base)
+          allow(subject).to receive(:fetch_http_file).with("http://builds.delivery.puppetlabs.net/pe-client-tools/#{opts[:pe_client_tools_sha]}/artifacts/apple/1111/PC1/x86_64", "pe-client-tools-#{opts[:pe_client_tools_version]}-1.osx1111.dmg", "tmp/repo_configs")
+          allow(host).to receive(:external_copy_base)
           expect(host).to receive(:generic_install_dmg).with("pe-client-tools-#{opts[:pe_client_tools_version]}-1.osx1111.dmg", "pe-client-tools-#{opts[:pe_client_tools_version]}", "pe-client-tools-#{opts[:pe_client_tools_version]}-1-installer.pkg")
           subject.install_pe_client_tools_on(host, opts)
         end
       end
+
+      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]}/artifacts/apple/1111/PC1/x86_64", "pe-client-tools-#{tag_opts[:pe_client_tools_version]}-1.osx1111.dmg", "tmp/repo_configs")
+          allow(host).to receive(:external_copy_base)
+          expect(host).to receive(:generic_install_dmg).with("pe-client-tools-#{tag_opts[:pe_client_tools_version]}-1.osx1111.dmg", "pe-client-tools-#{tag_opts[:pe_client_tools_version]}", "pe-client-tools-#{tag_opts[:pe_client_tools_version]}-1-installer.pkg")
+
+          subject.install_pe_client_tools_on(host, tag_opts)
+        end
+      end
     end
 
   end

metadata

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