beaker-puppet 0.17.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab9b20f21bd824b158c5ffa5b8e88d4ad05dff2b
-  data.tar.gz: 53b1a3c552fef8592d72485444e1cd7323b49cc6
+  metadata.gz: 175a3e08fbd658bd3d8de3b2887bd0528d81bece
+  data.tar.gz: d9705d9cd91f355d1d275c1404f5c358a960820e
 SHA512:
-  metadata.gz: d8218db2ae6f22c36b3a23c0a8ae3dcd663503900c5a6b0f22a027d4190cdda9a445d1c942750ddb7e6d16d4cd5d868bdc15e130a2957270a9c587d50556daca
-  data.tar.gz: e7b406d7f1e5ac8a9ecd0f768ce8499f9d814b1d4457b010f7e93d1fd994fb7a1879d773d698f10b6c97c59b87aed714228b4f7ada010f0e215bb14e1659648b
+  metadata.gz: b5fc2e1b4252e692f8e5f8022093603aa609994751502ef9042739e7752bad2c679932f52ba89638444a871c908cd27153a1be0d8794d28720788f0fd00eb38e
+  data.tar.gz: f705cc01f0635e048e5c3e4e14311822eee1b5ba95369a8a650af0afdcb854321f3e7956872199d96e55beb46cca7071fae96c72dabbcad74c53e9cd569fab28

data/Gemfile

@@ -16,7 +16,7 @@ end
 
 
 group :test do
-  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 3.24')
+  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 4.0')
   gem "beaker-abs", *location_for(ENV['ABS_VERSION'] || '~> 0.4.0')
 end
 

data/README.md

@@ -9,6 +9,27 @@ of beaker, please do, we would love any help that you'd like to provide.
 
 # How Do I Use This?
 
+## With Beaker 3.x
+
+This library is included as a dependency of Beaker 3.x versions and is automatically included, so there's nothing to do.
+
+## With Beaker 4.x
+
+As of Version 1.0 of `beaker-puppet`, the minimum supported version of beaker is Version 4.0. If you use `ENV['BEAKER_VERSION']`, you will have to ensure that this is compatible, and that if you are using a local Git repository it is up to date.
+
+As of beaker 4.0, all hypervisor and DSL extension libraries have been removed and are no longer dependencies. In order to use a specific hypervisor or DSL extension library in your project, you will need to include them alongside Beaker in your Gemfile or project.gemspec. E.g.
+
+~~~ruby
+# Gemfile
+gem 'beaker', '~>4.0'
+gem 'beaker-puppet', '~>1.0'
+# project.gemspec
+s.add_runtime_dependency 'beaker', '~>4.0'
+s.add_runtime_dependency 'beaker-puppet', '~>1.0'
+~~~
+
+For DSL Extension Libraries, you must also ensure that you `require` the library in your test files. You can do this manually in individual test files or in a test helper (if you have one). You can [use `Bundler.require()`](https://bundler.io/v1.16/guides/groups.html) to require the library automatically.
+
 ### Right Now? (beaker 3.x)
 
 At this point, beaker-puppet is included in beaker, so you don't have to _do_

data/acceptance/pre_suite/gem/install.rb

@@ -1,3 +1,5 @@
+require 'beaker-puppet'
+
 hosts.each do |host|
   install_puppet_from_gem(host, {:version => '3.8.7'})
   unless host['platform'] =~ /windows/

data/acceptance/pre_suite/git/install.rb

@@ -1,7 +1,5 @@
-begin
-  require 'beaker/acceptance/install_utils'
-  extend Beaker::Acceptance::InstallUtils
-end
+require 'beaker-puppet'
+
 test_name 'Puppet git pre-suite'
 
 install = [
@@ -10,8 +8,6 @@ install = [
   'puppet#3.8.7'
 ]
 
-SourcePath  = Beaker::DSL::InstallUtils::SourcePath
-
 PACKAGES = {
   :redhat => [
     'git',

data/acceptance/pre_suite/pkg/install.rb

@@ -1,3 +1,5 @@
+require 'beaker-puppet'
+
 # the version is required on windows
 # all versions are required for osx
 install_puppet({

data/acceptance/tests/README.md

@@ -1,3 +1,5 @@
 # Beaker Acceptance Tests: puppet
 
 Tests that depend upon Puppet being installed on the SUTs.
+
+As of Beaker 4.0, you must `require 'beaker-puppet'` in each of these test files in order to access beaker-puppet DSL extensions.

data/acceptance/tests/clone_git_repo_on_test.rb

@@ -0,0 +1,43 @@
+require 'beaker-puppet'
+
+confine :except, :platform => /^solaris-10/
+
+test_name 'Clone from git' do
+
+  PACKAGES = {
+    :redhat => [
+      'git',
+    ],
+    :debian => [
+      ['git', 'git-core'],
+    ],
+    :solaris_11 => [
+      ['git', 'developer/versioning/git'],
+    ],
+    :solaris_10 => [
+      'coreutils',
+      'curl', # update curl to fix "CURLOPT_SSL_VERIFYHOST no longer supports 1 as value!" issue
+      'git',
+    ],
+    :windows => [
+      'git',
+    ],
+    :sles => [
+      'git-core',
+    ]
+  }
+
+
+  install_packages_on(hosts, PACKAGES, :check_if_exists => true)
+
+  # implicitly tests build_giturl() and lookup_in_env()
+  hosts.each do |host|
+    on host, "echo #{GitHubSig} >> $HOME/.ssh/known_hosts"
+    testdir = host.tmpdir(File.basename(__FILE__))
+
+    step 'should be able to successfully clone a git repo' do
+      results = clone_git_repo_on(host, "#{testdir}", extract_repo_info_from(build_git_url('hiera')))
+      assert_match( %r{From.*github\.com[:/]puppetlabs/hiera}, result.output, 'Did not find clone')
+    end
+  end
+end

data/acceptance/tests/create_tmpdir_on_test.rb

@@ -0,0 +1,47 @@
+test_name "dsl::helpers::host_helpers #create_tmpdir_on" do
+  step "#create_tmpdir_on returns a temporary directory on the remote system" do
+    tmpdir = create_tmpdir_on default
+    assert_match %r{/}, tmpdir
+    assert_equal 0, on(default, "touch #{tmpdir}/testfile").exit_code
+  end
+
+  step "#create_tmpdir_on uses the specified path prefix when provided" do
+    tmpdir = create_tmpdir_on(default, "mypathprefix")
+    assert_match %r{/mypathprefix}, tmpdir
+    assert_equal 0, on(default, "touch #{tmpdir}/testfile").exit_code
+  end
+
+  step "#create_tmpdir_on fails if a non-existent user is specified" do
+    assert_raises Beaker::Host::CommandFailure do
+      tmpdir = create_tmpdir_on default, '', 'fakeuser'
+    end
+  end
+
+  step "#create_tmpdir_on sets the user if specified" do
+    default.user_present('tmpdirtestuser')
+    tmpdir = create_tmpdir_on(default, nil, 'tmpdirtestuser', nil)
+    assert_match /tmpdirtestuser/, on(default, "ls -ld #{tmpdir}").output
+    default.user_absent('tmpdirtestuser')
+  end
+
+  step "#create_tmpdir_on fails if a non-existent group is specified" do
+    assert_raises Beaker::Host::CommandFailure do
+      tmpdir = create_tmpdir_on default, '', nil, 'fakegroup'
+    end
+  end
+
+  step "#create_tmpdir_on sets the group if specified" do
+    default.group_present('tmpdirtestgroup')
+    tmpdir = create_tmpdir_on(default, nil, nil, 'tmpdirtestgroup')
+    assert_match /testgroup/, on(default, "ls -ld #{tmpdir}").output
+    default.group_absent('tmpdirtestgroup')
+  end
+
+  step "#create_tmpdir_on operates on all hosts if given a hosts array" do
+    tmpdirs = create_tmpdir_on hosts
+    hosts.zip(tmpdirs).each do |(host, tmpdir)|
+      assert_match %r{/}, tmpdir
+      assert_equal 0, on(host, "touch #{tmpdir}/testfile").exit_code
+    end
+  end
+end

data/acceptance/tests/install_smoke_test.rb

@@ -1,3 +1,5 @@
+require 'beaker-puppet'
+
 test_name "puppet install smoketest"
 
 step 'puppet install smoketest: verify \'facter --help\' can be successfully called on all hosts'

data/acceptance/tests/stub_host.rb

@@ -1,3 +1,5 @@
+require 'beaker-puppet'
+
 test_name "validate host stubbing behavior"
 
 def get_hosts_file(host)

data/acceptance/tests/web_helpers_test.rb

@@ -1,3 +1,5 @@
+require 'beaker-puppet'
+
 require 'webrick'
 require 'webrick/https'
 

data/acceptance/tests/with_puppet_running_on.rb

@@ -1,3 +1,5 @@
+require 'beaker-puppet'
+
 test_name 'skip_test in with_puppet_running_on' do
   assert_raises SkipTest do
     with_puppet_running_on(master, {}) do

data/beaker-puppet.gemspec

@@ -25,6 +25,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'pry', '~> 0.10'
 
+  # Acceptance Testing Dependencies
+  s.add_development_dependency 'beaker-vmpooler'
+
   # Documentation dependencies
   s.add_development_dependency 'yard'
   s.add_development_dependency 'markdown'

data/lib/beaker-puppet.rb

@@ -8,7 +8,7 @@ require 'beaker-puppet/helpers/rake_helpers'
 [ 'aio', 'foss' ].each do |lib|
   require "beaker-puppet/install_utils/#{lib}_defaults"
 end
-[ 'foss', 'puppet', 'ezbake', 'module' ].each do |lib|
+[ 'windows', 'foss', 'puppet', 'ezbake', 'module' ].each do |lib|
   require "beaker-puppet/install_utils/#{lib}_utils"
 end
 [ 'tk', 'facter', 'puppet' ].each do |lib|
@@ -19,34 +19,23 @@ require 'beaker-puppet/install_utils/puppet5'
 
 
 module BeakerPuppet
-  module InstallUtils
-    include Beaker::DSL::InstallUtils::FOSSDefaults
-    include Beaker::DSL::InstallUtils::AIODefaults
+  include Beaker::DSL::InstallUtils::FOSSDefaults
+  include Beaker::DSL::InstallUtils::AIODefaults
 
-    include Beaker::DSL::InstallUtils::PuppetUtils
-    include Beaker::DSL::InstallUtils::FOSSUtils
-    include Beaker::DSL::InstallUtils::EZBakeUtils
-    include Beaker::DSL::InstallUtils::ModuleUtils
+  include Beaker::DSL::InstallUtils::WindowsUtils
+  include Beaker::DSL::InstallUtils::PuppetUtils
+  include Beaker::DSL::InstallUtils::FOSSUtils
+  include Beaker::DSL::InstallUtils::EZBakeUtils
+  include Beaker::DSL::InstallUtils::ModuleUtils
 
-    include BeakerPuppet::Install::Puppet5
-  end
+  include Beaker::DSL::InstallUtils::Puppet5
 
-  module Helpers
-    include Beaker::DSL::Helpers::TKHelpers
-    include Beaker::DSL::Helpers::FacterHelpers
-    include Beaker::DSL::Helpers::PuppetHelpers
-  end
+  include Beaker::DSL::Helpers::TKHelpers
+  include Beaker::DSL::Helpers::FacterHelpers
+  include Beaker::DSL::Helpers::PuppetHelpers
 
   include Beaker::DSL::Wrappers
 end
 
-
-# # Boilerplate DSL inclusion mechanism:
-# # First we register our module with the Beaker DSL
-# Beaker::DSL.register( Beaker::DSL::Puppet )
-#
-# # Modules added into a module which has previously been included are not
-# # retroactively included in the including class.
-# #
-# # https://github.com/adrianomitre/retroactive_module_inclusion
-# Beaker::TestCase.class_eval { include Beaker::DSL }
+# Register the DSL extension
+Beaker::DSL.register( BeakerPuppet )

data/lib/beaker-puppet/helpers/puppet_helpers.rb

@@ -865,6 +865,55 @@ module Beaker
           sign_certificate_for(default)
         end
 
+        # Create a temp directory on remote host, optionally owned by specified user and group.
+        #
+        # @param [Host, Array<Host>, String, Symbol] hosts One or more hosts to act upon,
+        # or a role (String or Symbol) that identifies one or more hosts.
+        # @param [String] path_prefix A remote path prefix for the new temp directory.
+        # @param [String] user The name of user that should own the temp directory. If
+        # not specified, uses default permissions from tmpdir creation.
+        # @param [String] group The name of group that should own the temp directory.
+        # If not specified, uses default permissions from tmpdir creation.
+        #
+        # @return [String, Array<String>] Returns the name of the newly-created dir, or
+        # an array of names of newly-created dirs per-host
+        #
+        # @note While tempting, this method should not be "optimized" to coalesce calls to
+        # chown user:group when both options are passed, as doing so will muddy the spec.
+        def create_tmpdir_on(hosts, path_prefix = '', user = nil, group = nil)
+          block_on hosts do | host |
+            # create the directory
+            dir = host.tmpdir(path_prefix)
+            # only chown if explicitly passed; don't make assumptions about perms
+            # only `chown user` for cleaner codepaths
+            if user
+              # ensure user exists
+              if not host.user_get(user).success?
+                # clean up
+                host.rm_rf("#{dir}")
+                raise "User #{user} does not exist on #{host}."
+              end
+              # chown only user
+              host.chown(user, dir)
+              # on host, "chown #{user} #{dir}"
+            end
+            # only chgrp if explicitly passed; don't make assumptions about perms
+            if group
+              # ensure group exists
+              if not host.group_get(group).success?
+                # clean up
+                # on host, "rmdir #{dir}"
+                host.rm_rf(dir)
+                raise "Group #{group} does not exist on #{host}."
+              end
+              # chgrp
+              # on host, "chgrp #{group} #{dir}"
+              host.chgrp(group, dir)
+            end
+            dir
+          end
+        end
+
         # Create a temp directory on remote host with a user.  Default user
         # is puppet master user.
         #

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

@@ -1,4 +1,4 @@
-require "beaker/dsl/install_utils/windows_utils"
+require "beaker-puppet/install_utils/windows_utils"
 [ 'aio', 'foss' ].each do |lib|
   require "beaker-puppet/install_utils/#{lib}_defaults"
 end
@@ -1414,6 +1414,7 @@ module Beaker
             :solaris_11    => /solaris-11/,
             :windows       => /windows/,
             :eos           => /^eos-/,
+            :sles          => /sles/,
           }.freeze
 
           check_if_exists = options[:check_if_exists]

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

@@ -1,209 +1,211 @@
 require 'beaker/dsl/install_utils/foss_defaults'
 
-module BeakerPuppet
-  module Install
-    module Puppet5
-
-      include Beaker::DSL::InstallUtils::FOSSDefaults
-
-      # grab build json from the builds server
-      #
-      # @param [String] sha_yaml_url URL to the <SHA>.yaml file containing the
-      #    build details
-      #
-      # @return [Hash{String=>String}] build json parsed into a ruby hash
-      def fetch_build_details(sha_yaml_url)
-        dst_folder          = Dir.mktmpdir
-        sha_yaml_filename   = File.basename(  sha_yaml_url )
-        sha_yaml_folder_url = File.dirname(   sha_yaml_url )
-
-        sha_yaml_file_local_path = fetch_http_file(
-          sha_yaml_folder_url,
-          sha_yaml_filename,
-          dst_folder
-        )
-        file_hash = YAML.load_file( sha_yaml_file_local_path )
-
-        return sha_yaml_folder_url, file_hash[:platform_data]
-      end
+module Beaker
+  module DSL
+    module InstallUtils
+      module Puppet5
+
+        include Beaker::DSL::InstallUtils::FOSSDefaults
+
+        # grab build json from the builds server
+        #
+        # @param [String] sha_yaml_url URL to the <SHA>.yaml file containing the
+        #    build details
+        #
+        # @return [Hash{String=>String}] build json parsed into a ruby hash
+        def fetch_build_details(sha_yaml_url)
+          dst_folder          = Dir.mktmpdir
+          sha_yaml_filename   = File.basename(  sha_yaml_url )
+          sha_yaml_folder_url = File.dirname(   sha_yaml_url )
+
+          sha_yaml_file_local_path = fetch_http_file(
+            sha_yaml_folder_url,
+            sha_yaml_filename,
+            dst_folder
+          )
+          file_hash = YAML.load_file( sha_yaml_file_local_path )
+
+          return sha_yaml_folder_url, file_hash[:platform_data]
+        end
 
-      # 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
+        # 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
-        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
-      # @param [String] build_url URL to the build
-      #
-      # @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(host)
-        if packaging_platform.nil?
-          message = <<-EOF
-            :packaging_platform not provided for host '#{host}', platform '#{host[:platform]}'
-            :packaging_platform should be the platform-specific key from this list:
-              #{ build_details.keys }
-          EOF
-          fail_test( message )
-        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
+        # @param [String] build_url URL to the build
+        #
+        # @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(host)
+          if packaging_platform.nil?
+            message = <<-EOF
+              :packaging_platform not provided for host '#{host}', platform '#{host[:platform]}'
+              :packaging_platform should be the platform-specific key from this list:
+                #{ build_details.keys }
+            EOF
+            fail_test( message )
+          end
 
-        logger.debug("Platforms available for this build:")
-        logger.debug("#{ build_details.keys }")
-        logger.debug("PLATFORM SPECIFIC INFO for #{host} (packaging name '#{packaging_platform}'):")
-        packaging_data = build_details[packaging_platform]
-        logger.debug("- #{ packaging_data }, isnil? #{ packaging_data.nil? }")
-        if packaging_data.nil?
-          message = <<-EOF
-            :packaging_platform '#{packaging_platform}' for host '#{host}' not in build details
-            :packaging_platform should be the platform-specific key from this list:
-              #{ build_details.keys }
-          EOF
-          fail_test( message )
-        end
+          logger.debug("Platforms available for this build:")
+          logger.debug("#{ build_details.keys }")
+          logger.debug("PLATFORM SPECIFIC INFO for #{host} (packaging name '#{packaging_platform}'):")
+          packaging_data = build_details[packaging_platform]
+          logger.debug("- #{ packaging_data }, isnil? #{ packaging_data.nil? }")
+          if packaging_data.nil?
+            message = <<-EOF
+              :packaging_platform '#{packaging_platform}' for host '#{host}' not in build details
+              :packaging_platform should be the platform-specific key from this list:
+                #{ build_details.keys }
+            EOF
+            fail_test( message )
+          end
 
-        artifact_buildserver_path   = packaging_data[:artifact]
-        repoconfig_buildserver_path = packaging_data[:repo_config]
-        fail_test('no artifact_buildserver_path found') if artifact_buildserver_path.nil?
+          artifact_buildserver_path   = packaging_data[:artifact]
+          repoconfig_buildserver_path = packaging_data[:repo_config]
+          fail_test('no artifact_buildserver_path found') if artifact_buildserver_path.nil?
 
-        artifact_url    = "#{build_url}/#{artifact_buildserver_path}"
-        repoconfig_url  = "#{build_url}/#{repoconfig_buildserver_path}" unless repoconfig_buildserver_path.nil?
-        artifact_url_correct = link_exists?( artifact_url )
-        logger.debug("- artifact url: '#{artifact_url}'. Exists? #{artifact_url_correct}")
-        fail_test('artifact url built incorrectly') if !artifact_url_correct
+          artifact_url    = "#{build_url}/#{artifact_buildserver_path}"
+          repoconfig_url  = "#{build_url}/#{repoconfig_buildserver_path}" unless repoconfig_buildserver_path.nil?
+          artifact_url_correct = link_exists?( artifact_url )
+          logger.debug("- artifact url: '#{artifact_url}'. Exists? #{artifact_url_correct}")
+          fail_test('artifact url built incorrectly') if !artifact_url_correct
 
-        return artifact_url, repoconfig_url
-      end
+          return artifact_url, repoconfig_url
+        end
 
-      # install build artifact on the given host
-      #
-      # @param [Host] host Host to install artifact on
-      # @param [String] artifact_url URL of the project install artifact
-      # @param [String] project_name Name of project for artifact. Needed for OSX installs
-      #
-      # @return nil
-      def install_artifact_on(host, artifact_url, project_name)
-        variant, version, _, _ = host[:platform].to_array
-        case variant
-        when 'eos'
-          host.get_remote_file(artifact_url)
-          onhost_package_file = File.basename(artifact_url)
-          # TODO Will be refactored into {Beaker::Host#install_local_package}
-          #   immediately following this work. The release timing makes it
-          #   necessary to have this here separately for a short while
-          host.install_from_file(onhost_package_file)
-        when 'solaris'
-          artifact_filename = File.basename(artifact_url)
-          artifact_folder = File.dirname(artifact_url)
-          fetch_http_file(artifact_folder, artifact_filename, '.')
-          onhost_package_dir = host.tmpdir('puppet_installer')
-          scp_to host, artifact_filename, onhost_package_dir
-          onhost_package_file = "#{onhost_package_dir}/#{artifact_filename}"
-          host.install_local_package(onhost_package_file, '.')
-        when 'osx'
-          on host, "curl -O #{artifact_url}"
-          onhost_package_file = "#{project_name}*"
-          host.install_local_package(onhost_package_file)
-        when 'windows'
-          if project_name == 'puppet-agent'
-            install_msi_on(host, artifact_url)
+        # install build artifact on the given host
+        #
+        # @param [Host] host Host to install artifact on
+        # @param [String] artifact_url URL of the project install artifact
+        # @param [String] project_name Name of project for artifact. Needed for OSX installs
+        #
+        # @return nil
+        def install_artifact_on(host, artifact_url, project_name)
+          variant, version, _, _ = host[:platform].to_array
+          case variant
+          when 'eos'
+            host.get_remote_file(artifact_url)
+            onhost_package_file = File.basename(artifact_url)
+            # TODO Will be refactored into {Beaker::Host#install_local_package}
+            #   immediately following this work. The release timing makes it
+            #   necessary to have this here separately for a short while
+            host.install_from_file(onhost_package_file)
+          when 'solaris'
+            artifact_filename = File.basename(artifact_url)
+            artifact_folder = File.dirname(artifact_url)
+            fetch_http_file(artifact_folder, artifact_filename, '.')
+            onhost_package_dir = host.tmpdir('puppet_installer')
+            scp_to host, artifact_filename, onhost_package_dir
+            onhost_package_file = "#{onhost_package_dir}/#{artifact_filename}"
+            host.install_local_package(onhost_package_file, '.')
+          when 'osx'
+            on host, "curl -O #{artifact_url}"
+            onhost_package_file = "#{project_name}*"
+            host.install_local_package(onhost_package_file)
+          when 'windows'
+            if project_name == 'puppet-agent'
+              install_msi_on(host, artifact_url)
+            else
+              generic_install_msi_on(host, artifact_url)
+            end
+          when 'aix'
+            artifact_filename = File.basename(artifact_url)
+            artifact_folder = File.dirname(artifact_url)
+            fetch_http_file(artifact_folder, artifact_filename, '.')
+            onhost_package_dir = host.tmpdir('puppet_installer')
+            scp_to host, artifact_filename, onhost_package_dir
+            onhost_package_file = "#{onhost_package_dir}/#{artifact_filename}"
+
+            # TODO Will be refactored into {Beaker::Host#install_local_package}
+            #   immediately following this work. The release timing makes it
+            #   necessary to have this here seperately for a short while
+            # NOTE: the AIX 7.1 package will only install on 7.2 with
+            # --ignoreos. This is a bug in package building on AIX 7.1's RPM
+            if version == "7.2"
+              aix_72_ignoreos_hack = "--ignoreos"
+            end
+            on host, "rpm -ivh #{aix_72_ignoreos_hack} #{onhost_package_file}"
           else
-            generic_install_msi_on(host, artifact_url)
+            host.install_package(artifact_url)
           end
-        when 'aix'
-          artifact_filename = File.basename(artifact_url)
-          artifact_folder = File.dirname(artifact_url)
-          fetch_http_file(artifact_folder, artifact_filename, '.')
-          onhost_package_dir = host.tmpdir('puppet_installer')
-          scp_to host, artifact_filename, onhost_package_dir
-          onhost_package_file = "#{onhost_package_dir}/#{artifact_filename}"
-
-          # TODO Will be refactored into {Beaker::Host#install_local_package}
-          #   immediately following this work. The release timing makes it
-          #   necessary to have this here seperately for a short while
-          # NOTE: the AIX 7.1 package will only install on 7.2 with
-          # --ignoreos. This is a bug in package building on AIX 7.1's RPM
-          if version == "7.2"
-            aix_72_ignoreos_hack = "--ignoreos"
-          end
-          on host, "rpm -ivh #{aix_72_ignoreos_hack} #{onhost_package_file}"
-        else
-          host.install_package(artifact_url)
-        end
-      end
-
-      # Sets up the repo_configs on the host for this build
-      #
-      # @param [Host] host Host to install repo_configs on
-      # @param [String] repoconfig_url URL to the repo_config
-      #
-      # @return nil
-      def install_repo_configs_on(host, repoconfig_url)
-        if repoconfig_url.nil?
-          logger.warn("No repo_config for host '#{host}'. Skipping repo_config install")
-          return
         end
 
-        install_repo_configs_from_url( host, repoconfig_url )
-      end
+        # Sets up the repo_configs on the host for this build
+        #
+        # @param [Host] host Host to install repo_configs on
+        # @param [String] repoconfig_url URL to the repo_config
+        #
+        # @return nil
+        def install_repo_configs_on(host, repoconfig_url)
+          if repoconfig_url.nil?
+            logger.warn("No repo_config for host '#{host}'. Skipping repo_config install")
+            return
+          end
 
-      # Installs a specified puppet project on all hosts. Gets build information
-      #   from the provided YAML file located at the +sha_yaml_url+ parameter.
-      #
-      # @param [String] project_name Name of the project to install
-      # @param [String] sha_yaml_url URL to the <SHA>.yaml file containing the
-      #    build details
-      # @param [String or Array] hosts Optional string or array of host or hosts to
-      #    install on
-      #
-      # @note This install method only works for Puppet versions >= 5.0
-      #
-      # @return nil
-      def install_from_build_data_url(project_name, sha_yaml_url, local_hosts = nil)
-        if !link_exists?( sha_yaml_url )
-          message = <<-EOF
-            <SHA>.yaml URL '#{ sha_yaml_url }' does not exist.
-            Please update the `sha_yaml_url` parameter to the `puppet5_install` method.
-          EOF
-          fail_test( message )
+          install_repo_configs_from_url( host, repoconfig_url )
         end
 
-        base_url, build_details = fetch_build_details( sha_yaml_url )
+        # Installs a specified puppet project on all hosts. Gets build information
+        #   from the provided YAML file located at the +sha_yaml_url+ parameter.
+        #
+        # @param [String] project_name Name of the project to install
+        # @param [String] sha_yaml_url URL to the <SHA>.yaml file containing the
+        #    build details
+        # @param [String or Array] hosts Optional string or array of host or hosts to
+        #    install on
+        #
+        # @note This install method only works for Puppet versions >= 5.0
+        #
+        # @return nil
+        def install_from_build_data_url(project_name, sha_yaml_url, local_hosts = nil)
+          if !link_exists?( sha_yaml_url )
+            message = <<-EOF
+              <SHA>.yaml URL '#{ sha_yaml_url }' does not exist.
+              Please update the `sha_yaml_url` parameter to the `puppet5_install` method.
+            EOF
+            fail_test( message )
+          end
 
-        install_targets = local_hosts.nil? ? hosts : Array(local_hosts)
+          base_url, build_details = fetch_build_details( sha_yaml_url )
 
-        install_targets.each do |host|
-          artifact_url, repoconfig_url = host_urls( host, build_details, base_url )
-          if repoconfig_url.nil?
-            install_artifact_on( host, artifact_url, project_name )
-          else
-            install_repo_configs_on( host, repoconfig_url )
-            host.install_package( project_name )
+          install_targets = local_hosts.nil? ? hosts : Array(local_hosts)
+
+          install_targets.each do |host|
+            artifact_url, repoconfig_url = host_urls( host, build_details, base_url )
+            if repoconfig_url.nil?
+              install_artifact_on( host, artifact_url, project_name )
+            else
+              install_repo_configs_on( host, repoconfig_url )
+              host.install_package( project_name )
+            end
+            configure_type_defaults_on( host )
           end
-          configure_type_defaults_on( host )
         end
-      end
 
+      end
     end
   end
 end