beaker-puppet 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2eaf1431f3c69d52d3d5cca39a3ca55e1aa1107a
-  data.tar.gz: 7bc51601fdeee7f6c989f631abe6fa5ff7d5719d
+  metadata.gz: a0c098df759909b2d7139e23776333e7f7da342c
+  data.tar.gz: ba69889bd92bbe1d47b7a5e0fe16b844aa7ad7b1
 SHA512:
-  metadata.gz: 313ae2bb977c25c2c31b0469498d9006ef46ab7778ca9eb53fd94c9456bd8e11e29edeeaec0c4c473f8e241d4f23f85465fd9cf6b713cad4d85f0d19137832f2
-  data.tar.gz: 735df403910919b2f6226a82ffbb107e50770908013126622266298d80b9aecc5f4507ba998e8259e322ffd6ffc9077302ebdf3bab3fa88b9c23df0bac65eda1
+  metadata.gz: 49299bd7b7715c3e50d0aaf79397c5add2a29dca58b76284266e5f2b8d4447532784abe943ca4013b77bd5533316385ee323ec3680fa2e0c1f257209986bd49e
+  data.tar.gz: 50e8a96e4e5ebf3951aaf823436999374e18229b6359900a000c7fd1b4881234a1e3a4c9af8c8d1abbbc9bb2968e59d637597aacf050afea8f87d4b1f1c140f2

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

@@ -1293,7 +1293,7 @@ module Beaker
             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
-            opts[:puppet_collection] ||= 'PC1'
+            opts[:puppet_collection] ||= get_puppet_collection(opts[:puppet_agent_version])
             add_role(host, 'aio') #we are installing agent, so we want aio role
             release_path = opts[:download_url]
             variant, version, arch, codename = host['platform'].to_array

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

@@ -72,6 +72,20 @@ module Beaker
           end
         end
 
+        #Given an agent_version, return the puppet collection associated with that agent version
+        #@param [String] agent_version version string or 'latest'
+        def get_puppet_collection(agent_version = 'latest')
+          collection = "PC1"
+          if agent_version != 'latest'
+            if ! version_is_less( agent_version, "5.5.4") and version_is_less(agent_version, "5.99")
+              collection = "puppet5"
+            elsif ! version_is_less( agent_version, "5.99")
+              collection = "puppet6"
+            end
+          end
+          collection
+        end
+
         #Configure the provided hosts to be of the provided type (one of foss, aio, pe), if the host
         #is already associated with a type then remove the previous settings for that type
         # @param [Host, Array<Host>, String, Symbol] hosts    One or more hosts to act upon,

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

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

@@ -955,12 +955,6 @@ describe ClassMixedWithDSLInstallUtils do
       expect( host['dist'] ).to be == "puppet-agent-VERSION-x64"
 
     end
-  end
-
-  describe '#install_puppet_agent_pe_promoted_repo_on' do
-
-
-
   end
 
   describe '#install_cert_on_windows' do
@@ -1353,6 +1347,62 @@ describe ClassMixedWithDSLInstallUtils do
     it 'calls fetch_http_file with no ending slash' do
       test_fetch_http_file_no_ending_slash( 'debian-5-x86_64' )
     end
+
+    context 'when setting different agent versions' do
+      let( :host ) { basic_hosts.first }
+      let( :platform ) { Object.new() }
+      let( :downloadurl ) { 'http://pm.puppetlabs.com' }
+      before :each do
+        allow( platform ).to receive( :to_array ) { ['el', '6', 'x4'] }
+        allow( subject ).to receive( :options ).and_return( opts )
+        allow( subject ).to receive( :scp_to )
+        allow( subject ).to receive( :configure_type_defaults_on ).with( host )
+      end
+
+      it 'sets correct file paths when agent version is set to latest' do
+        host['platform'] = platform
+        agentversion = 'latest'
+        collection = 'PC1'
+        opts = { :puppet_agent_version => "#{agentversion}" , :pe_promoted_builds_url => "#{downloadurl}" }
+
+        expect( subject ).to receive( :fetch_http_file ).once.with( /pm\.puppetlabs\.com\/puppet-agent\/.*\/#{agentversion}\/repos/, /puppet-agent-el-6*/, /\/el$/ )
+        expect( host).to receive( :pe_puppet_agent_promoted_package_install ).with( anything, /puppet-agent-el-6*/, /.*\/el\/6\/#{collection}\/.*rpm/, /puppet-agent-el-6/, anything )
+        subject.install_puppet_agent_pe_promoted_repo_on( host, opts )
+      end
+
+      it 'sets correct file paths for agent version < 5.5.4' do
+        host['platform'] = platform
+        agentversion = '5.3.3'
+        collection = 'PC1'
+        opts = { :puppet_agent_version => "#{agentversion}" , :pe_promoted_builds_url => "#{downloadurl}"}
+
+        expect( subject ).to receive( :fetch_http_file ).once.with( /pm\.puppetlabs\.com\/puppet-agent\/.*\/#{agentversion}\/repos/, /puppet-agent-el-6*/, /\/el$/ )
+        expect( host).to receive( :pe_puppet_agent_promoted_package_install ).with( anything, /puppet-agent-el-6*/, /.*\/el\/6\/#{collection}\/.*rpm/, /puppet-agent-el-6/, anything )
+        subject.install_puppet_agent_pe_promoted_repo_on( host, opts )
+      end
+
+      it 'sets correct file paths for agent version >= 5.5.4' do
+        host['platform'] = platform
+        agentversion = '5.5.4'
+        collection = 'puppet5'
+        opts = { :puppet_agent_version => "#{agentversion}" , :pe_promoted_builds_url => "#{downloadurl}"}
+
+        expect( subject ).to receive( :fetch_http_file ).once.with( /pm\.puppetlabs\.com\/puppet-agent\/.*\/#{agentversion}\/repos/, /puppet-agent-el-6*/, /\/el$/ )
+        expect( host).to receive( :pe_puppet_agent_promoted_package_install ).with( anything, /puppet-agent-el-6*/, /.*\/el\/6\/#{collection}\/.*rpm/, /puppet-agent-el-6/, anything )
+        subject.install_puppet_agent_pe_promoted_repo_on( host, opts )
+      end
+
+      it 'sets correct file paths for agent version > 5.99' do
+        host['platform'] = platform
+        agentversion = '6.0'
+        collection = 'puppet6'
+        opts = { :puppet_agent_version => "#{agentversion}" , :pe_promoted_builds_url => "#{downloadurl}"}
+
+        expect( subject ).to receive( :fetch_http_file ).once.with( /pm\.puppetlabs\.com\/puppet-agent\/.*\/#{agentversion}\/repos/, /puppet-agent-el-6*/, /\/el$/ )
+        expect( host).to receive( :pe_puppet_agent_promoted_package_install ).with( anything, /puppet-agent-el-6*/, /.*\/el\/6\/#{collection}\/.*rpm/, /puppet-agent-el-6/, anything )
+        subject.install_puppet_agent_pe_promoted_repo_on( host, opts )
+      end
+    end
   end
 
   describe '#remove_puppet_on' do

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

@@ -136,4 +136,20 @@ describe ClassMixedWithDSLInstallUtils do
     end
 
   end
+
+  describe "get_puppet_collection" do
+    it "receives agent_version 'latest' and return collection 'PC1'" do
+      expect(subject.get_puppet_collection('latest')).to eq('PC1')
+    end
+    it "receives agent_version between 5.5.4 and 5.99 and return collection 'puppet5'" do
+      expect(subject.get_puppet_collection('5.5.4')).to eq('puppet5')
+    end
+    it "receives agent_version greater than 5.99 and return collection 'puppet6'" do
+      expect(subject.get_puppet_collection('6.0')).to eq('puppet6')
+    end
+    it "receives agent_version less than 5.5.4 and return collection 'PC1'" do
+      expect(subject.get_puppet_collection('3.0')).to eq('PC1')
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-10 00:00:00.000000000 Z
+date: 2018-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec