beaker-puppet 0.15.2 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 025f9370e1244e63e10ab6629c1069289a801c11
-  data.tar.gz: 71d17c2a14d18f791ec4d1744e7973f7c0487016
+  metadata.gz: f99b5ea3158b18360735f58958b7994df0bc002e
+  data.tar.gz: 74049c9e805053122780a57be393f51bf53e2fe5
 SHA512:
-  metadata.gz: 8f3acb63dacd5f6d3944c00d79ce8919c7cb74d9777421d657e72edf02496682cea0b635740a5597a11af62ee193bbd7231b4c865163e51b737bda7c97eb6146
-  data.tar.gz: 9c8f52ec56ef1498dc66cdc514c6733d046c268ca77525a326416a08f5246c51c2370ab75c0b15b9380ad13a96e91ac2ab5126765d934e4aefbf562a0ca019de
+  metadata.gz: c065c58d81584d892e58fab12abc9fabd69d7487351417575d76e5e54230b1c4b4dd26ab01faa41c36ca4b99f41819b85dd27696d055de56db60ef5377817f1d
+  data.tar.gz: 83c38cb1256117144fa55f972c35d4a757f06864bf408e7593bfa5ec0e87ba2e7e18bdae614a6aaa0f91d72aebdb30cb45ce9b9ca7197797b2af21d05cd6ad7c

data/beaker-puppet.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   # Testing dependencies
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rspec-its'
-  s.add_development_dependency 'fakefs', '~> 0.6'
+  s.add_development_dependency 'fakefs', '~> 0.6', '< 0.14.0'
   s.add_development_dependency 'rake', '~> 10.1'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'pry', '~> 0.10'

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

@@ -27,7 +27,29 @@ module BeakerPuppet
         return sha_yaml_folder_url, file_hash[:platform_data]
       end
 
-      # gets the artifact & repo_config URLs for this host in the build
+      # Get the host's packaging platform, based on beaker-hostgenerator's
+      # osinfo hash and the environment. Set ENV['BEAKER_PACKAGING_PLATFORMS']
+      # to override the default packaging platform specified by
+      # beaker-hostgenerator. This should be a comma-separated string with
+      # entries of the format `<host-platform>=<override-platform>`
+      #
+      # @param [Host] host Host whose packaging platform to determine
+      # @return [String] The packaging platform
+      def host_packaging_platform(host)
+        packaging_platform = host[:packaging_platform]
+        if ENV['BEAKER_PACKAGING_PLATFORMS']
+          overrides = Hash[ENV['BEAKER_PACKAGING_PLATFORMS'].split(',').map { |e| e.split('=') }]
+          logger.debug("Found packaging platform overrides: #{overrides}")
+          if overrides[host[:platform]]
+            platform = overrides[host[:platform]]
+            logger.debug("Default beaker packaging platform '#{host[:packaging_platform]}' for '#{host[:platform]}' overridden as '#{platform}'")
+            packaging_platform = platform
+          end
+        end
+        packaging_platform
+      end
+
+      # Gets the artifact & repo_config URLs for this host in the build.
       #
       # @param [Host] host Host to get artifact URL for
       # @param [Hash] build_details Details of the build in a hash
@@ -36,7 +58,7 @@ module BeakerPuppet
       # @return [String, String] URL to the build artifact, URL to the repo_config
       #   (nil if there is no repo_config for this platform for this build)
       def host_urls(host, build_details, build_url)
-        packaging_platform = host[:packaging_platform]
+        packaging_platform = host_packaging_platform(host)
         if packaging_platform.nil?
           message = <<-EOF
             :packaging_platform not provided for host '#{host}', platform '#{host[:platform]}'

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '0.15.2'
+  VERSION = '0.16.0'
 end

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

@@ -78,6 +78,10 @@ describe ClassMixedWithDSLInstallUtils do
       details
     }
 
+    before :each do
+      allow( subject ).to receive( :host_packaging_platform ) { packaging_platform }
+    end
+
     it 'fails if there\'s no artifact value for the given platform' do
       allow( artifact_path ).to receive( :nil? ) { true }
       expect {
@@ -135,6 +139,41 @@ describe ClassMixedWithDSLInstallUtils do
 
   end
 
+  describe "#host_packaging_platform" do
+    let( :default_platform ) { 'default-platform' }
+    let( :overridden_platform ) { 'overridden-platform' }
+    let( :overrides ) { 'default-platform=overridden-platform' || @overrides }
+    let( :host ) {
+      host = hosts[0]
+      allow( host ).to receive( :[] ).with( :packaging_platform ) { default_platform }
+      allow( host ).to receive( :[] ).with( :platform ) { default_platform }
+      host
+    }
+
+    before :each do
+      @original_platforms = ENV['BEAKER_PACKAGING_PLATFORMS']
+    end
+
+    after :each do
+      ENV['BEAKER_PACKAGING_PLATFORMS'] = @original_platforms
+    end
+
+    it "applies an override to a platform" do
+      ENV['BEAKER_PACKAGING_PLATFORMS'] = overrides
+      expect(subject.host_packaging_platform(host)).to eq(overridden_platform)
+    end
+
+    it "applies a list of overrides to a platform" do
+      ENV['BEAKER_PACKAGING_PLATFORMS'] = "aix-7.1-power=aix-6.1-power,#{overrides}"
+      expect(subject.host_packaging_platform(host)).to eq(overridden_platform)
+    end
+
+    it "doesn't apply overrides if the current host's platform isn't overridden" do
+      ENV['BEAKER_PACKAGING_PLATFORMS'] = "aix-7.1-power=aix-6.1-power"
+      expect(subject.host_packaging_platform(host)).to eq(default_platform)
+    end
+  end
+
   describe '#install_artifact_on' do
 
     let( :artifact_url ) { 'url://in/the/jungle/lies/the/prize.pnc' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.16.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-07 00:00:00.000000000 Z
+date: 2018-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -45,6 +45,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,6 +55,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement