beaker 2.18.3 → 2.19.0

data/acceptance/lib/beaker/acceptance/install_utils.rb

@@ -0,0 +1,58 @@
+module Beaker
+  module Acceptance
+    module InstallUtils
+
+      PLATFORM_PATTERNS = {
+        :redhat        => /fedora|el|centos/,
+        :debian        => /debian|ubuntu/,
+        :debian_ruby18 => /debian|ubuntu-lucid|ubuntu-precise/,
+        :solaris_10    => /solaris-10/,
+        :solaris_11    => /solaris-11/,
+        :windows       => /windows/,
+        :sles          => /sles/,
+      }.freeze
+
+      # Installs packages on the hosts.
+      #
+      # @param hosts [Array<Host>] Array of hosts to install packages to.
+      # @param package_hash [Hash{Symbol=>Array<String,Array<String,String>>}]
+      #   Keys should be a symbol for a platform in PLATFORM_PATTERNS.  Values
+      #   should be an array of package names to install, or of two element
+      #   arrays where a[0] is the command we expect to find on the platform
+      #   and a[1] is the package name (when they are different).
+      # @param options [Hash{Symbol=>Boolean}]
+      # @option options [Boolean] :check_if_exists First check to see if
+      #   command is present before installing package.  (Default false)
+      # @return true
+      def install_packages_on(hosts, package_hash, options = {})
+        return true if hosts == nil
+        check_if_exists = options[:check_if_exists]
+        hosts = [hosts] unless hosts.kind_of?(Array)
+        hosts.each do |host|
+          package_hash.each do |platform_key,package_list|
+            if pattern = PLATFORM_PATTERNS[platform_key]
+              if pattern.match(host['platform'])
+                package_list.each do |cmd_pkg|
+                  if cmd_pkg.kind_of?(Array)
+                    command, package = cmd_pkg
+                  else
+                    command = package = cmd_pkg
+                  end
+                  if !check_if_exists || !host.check_for_package(command)
+                    host.logger.notify("Installing #{package}")
+                    additional_switches = '--allow-unauthenticated' if platform_key == :debian
+                    host.install_package(package, additional_switches)
+                  end
+                end
+              end
+            else
+              raise("Unknown platform '#{platform_key}' in package_hash")
+            end
+          end
+        end
+        return true
+      end
+
+    end
+  end
+end

data/acceptance/pre_suite/puppet_git/install.rb

@@ -1,3 +1,9 @@
+begin
+  require 'beaker/acceptance/install_utils'
+  extend Beaker::Acceptance::InstallUtils
+end
+test_name 'Puppet git pre-suite'
+
 install = [
   'facter#2.1.0',
   'hiera#1.3.4',
@@ -40,73 +46,8 @@ PACKAGES = {
   ]
 }
 
-PLATFORM_PATTERNS = {
-  :redhat        => /fedora|el|centos/,
-  :debian        => /debian|ubuntu/,
-  :debian_ruby18 => /debian|ubuntu-lucid|ubuntu-precise/,
-  :solaris_10    => /solaris-10/,
-  :solaris_11    => /solaris-11/,
-  :windows       => /windows/,
-  :sles          => /sles/,
-}.freeze
-
-# Installs packages on the hosts.
-#
-# @param hosts [Array<Host>] Array of hosts to install packages to.
-# @param package_hash [Hash{Symbol=>Array<String,Array<String,String>>}]
-#   Keys should be a symbol for a platform in PLATFORM_PATTERNS.  Values
-#   should be an array of package names to install, or of two element
-#   arrays where a[0] is the command we expect to find on the platform
-#   and a[1] is the package name (when they are different).
-# @param options [Hash{Symbol=>Boolean}]
-# @option options [Boolean] :check_if_exists First check to see if
-#   command is present before installing package.  (Default false)
-# @return true
-def install_packages_on(hosts, package_hash, options = {})
-  return true if hosts == nil
-  check_if_exists = options[:check_if_exists]
-  hosts = [hosts] unless hosts.kind_of?(Array)
-  hosts.each do |host|
-    package_hash.each do |platform_key,package_list|
-      if pattern = PLATFORM_PATTERNS[platform_key]
-        if pattern.match(host['platform'])
-          package_list.each do |cmd_pkg|
-            if cmd_pkg.kind_of?(Array)
-              command, package = cmd_pkg
-            else
-              command = package = cmd_pkg
-            end
-            if !check_if_exists || !host.check_for_package(command)
-              host.logger.notify("Installing #{package}")
-              additional_switches = '--allow-unauthenticated' if platform_key == :debian
-              host.install_package(package, additional_switches)
-            end
-          end
-        end
-      else
-        raise("Unknown platform '#{platform_key}' in package_hash")
-      end
-    end
-  end
-  return true
-end
-
 install_packages_on(hosts, PACKAGES, :check_if_exists => true)
 
-def lookup_in_env(env_variable_name, project_name, default)
-  project_specific_name = "#{project_name.upcase.gsub("-","_")}_#{env_variable_name}"
-  ENV[project_specific_name] || ENV[env_variable_name] || default
-end
-
-def build_giturl(project_name, git_fork = nil, git_server = nil)
-  git_fork ||= lookup_in_env('FORK', project_name, 'puppetlabs')
-  git_server ||= lookup_in_env('GIT_SERVER', project_name, 'github.com')
-  repo = (git_server == 'github.com') ?
-    "#{git_fork}/#{project_name}.git" :
-    "#{git_fork}-#{project_name}.git"
-  "git://#{git_server}/#{repo}"
-end
-
 hosts.each do |host|
   case host['platform']
   when /windows/

data/acceptance/tests/foss_utils/clone_git_repo_on.rb

@@ -0,0 +1,49 @@
+begin
+  require 'beaker/acceptance/install_utils'
+  extend Beaker::Acceptance::InstallUtils
+end
+test_name 'Clone from git'
+
+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)
+
+# build_giturl implicitly looks these up
+ENV['HIERA_FORK']='puppetlabs'
+ENV['FORK']='fail'
+
+# implicitly tests build_giturl() and lookup_in_env()
+hosts.each do |host|
+  on host, "echo #{GitHubSig} >> $HOME/.ssh/known_hosts"
+  testdir = create_tmpdir_on(host, File.basename(__FILE__))
+
+  step 'should find fork name from the correct environment variable'
+  results = clone_git_repo_on(host, "#{testdir}", extract_repo_info_from(build_git_url('puppet')))
+  assert_match( /github\.com:fail/, result.cmd, 'Did not find correct fork name')
+  assert_equal( 1, result.exit_code, 'Did not produce error exit_code of 1')
+
+  step 'should clone hiera from correct fork'
+  results = clone_git_repo_on(host, "#{testdir}", extract_repo_info_from(build_git_url('hiera')))
+  assert_match( /From github\.com:puppetlabs\/hiera/, result.output, 'Did not find clone')
+end

data/beaker.gemspec

@@ -39,6 +39,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'inifile', '~> 2.0'
   s.add_runtime_dependency 'rsync', '~> 1.0.9'
   s.add_runtime_dependency 'open_uri_redirections', '~> 0.2.1'
+  s.add_runtime_dependency 'beaker-answers', '~> 0.0'
+  s.add_runtime_dependency 'stringify-hash', '~> 0.0'
 
   # Optional provisioner specific support
   s.add_runtime_dependency 'rbvmomi', '~> 1.8'

data/lib/beaker/dsl/helpers/web_helpers.rb

@@ -33,7 +33,7 @@ module Beaker
         #
         # @param [String] base_url The base url from which to recursively download
         #                          files.
-        # @param [String] file_name The trailing name compnent of both the source url
+        # @param [String] file_name The trailing name component of both the source url
         #                           and the destination file.
         # @param [String] dst_dir The local destination directory.
         #
@@ -44,6 +44,7 @@ module Beaker
           require 'open-uri'
           require 'open_uri_redirections'
           FileUtils.makedirs(dst_dir)
+          base_url.chomp!('/')
           src = "#{base_url}/#{file_name}"
           dst = File.join(dst_dir, file_name)
           if File.exists?(dst)

data/lib/beaker/dsl/install_utils/aio_defaults.rb

@@ -36,7 +36,6 @@ module Beaker
           else
             host['group'] = 'puppet'
           end
-          host['type'] = 'aio'
         end
 
         # Add the appropriate aio defaults to an array of hosts
@@ -60,7 +59,6 @@ module Beaker
           AIO_DEFAULTS[platform].each_pair do |key, val|
             host.delete(key)
           end
-          host['type'] = nil
           host['group'] = nil
         end
 

data/lib/beaker/dsl/install_utils/foss_utils.rb

@@ -1,4 +1,4 @@
-[ 'aio_defaults', 'foss_defaults', 'puppet_utils' ].each do |lib|
+[ 'aio_defaults', 'foss_defaults', 'puppet_utils', 'windows_utils' ].each do |lib|
     require "beaker/dsl/install_utils/#{lib}"
 end
 module Beaker
@@ -18,6 +18,7 @@ module Beaker
         include AIODefaults
         include FOSSDefaults
         include PuppetUtils
+        include WindowsUtils
 
         # The default install path
         SourcePath  = "/opt/puppet-git-repos"
@@ -28,26 +29,39 @@ module Beaker
         # Github's ssh signature for cloning via ssh
         GitHubSig   = 'github.com,207.97.227.239 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ=='
 
-        # Set defaults and PATH for these hosts to be either foss or aio, have host['type'] == aio for aio settings, defaults
-        # to foss.
+        # lookup project-specific git environment variables
+        # PROJECT_VAR or VAR otherwise return the default
         #
-        # @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.
-        def configure_foss_defaults_on( hosts )
-          block_on hosts do |host|
-            if (not_controller(host) && host[:version] && (not version_is_less(host[:version], '4.0'))) \
-              or (host['type'] && host['type'] =~ /aio/)
-              # add aio defaults to host
-              add_aio_defaults_on(host)
-              # provide a sane default here for puppetservice
-              host['puppetservice'] ||= 'puppetserver'
-            else
-              add_foss_defaults_on(host)
-            end
-            # add pathing env
-            add_puppet_paths_on(host)
+        # @!visibility private
+        def lookup_in_env(env_variable_name, project_name=nil, default=nil)
+          env_variable_name     = "#{env_variable_name.upcase.gsub('-','_')}"
+          project_specific_name = "#{project_name.upcase.gsub('-','_')}_#{env_variable_name}" if project_name
+          project_name && ENV[project_specific_name] || ENV[env_variable_name] || default
+        end
+
+        # @param [String] project_name
+        # @param [String] git_fork     When not provided will use PROJECT_FORK environment variable
+        # @param [String] git_server   When not provided will use PROJECT_SERVER environment variable
+        # @param [String] git_protocol 'git','ssh','https'
+        #
+        # @return [String] Returns a git-usable url
+        #
+        # TODO: enable other protocols, clarify, http://git-scm.com/book/ch4-1.html
+        def build_git_url(project_name, git_fork = nil, git_server = nil, git_protocol='https')
+          git_fork   ||= lookup_in_env('FORK',   project_name, 'puppetlabs')
+          git_server ||= lookup_in_env('SERVER', project_name, 'github.com')
+
+          case git_protocol
+          when /(ssh|git)/
+            git_protocol = 'git@'
+          when /https/
+            git_protocol = 'https://'
           end
+
+          repo = (git_server == 'github.com') ? "#{git_fork}/#{project_name}.git" : "#{git_fork}-#{project_name}.git"
+          return git_protocol == 'git@' ? "#{git_protocol}#{git_server}:#{repo}" : "#{git_protocol}#{git_server}/#{repo}"
         end
+        alias_method :build_giturl, :build_git_url
 
         # @param [String] uri A uri in the format of <git uri>#<revision>
         #                     the `git://`, `http://`, `https://`, and ssh
@@ -121,9 +135,18 @@ module Beaker
           version
         end
 
+        # @param [Host] host An object implementing {Beaker::Hosts}'s
+        #                    interface.
+        # @param [String] path The path on the remote [host] to the repository
+        # @param [Hash{Symbol=>String}] repository A hash representing repo
+        #                                          info like that emitted by
+        #                                          {#extract_repo_info_from}
         #
-        # @see #find_git_repo_versions
-        def install_from_git host, path, repository
+        # @note This requires the helper methods:
+        #       * {Beaker::DSL::Helpers#on}
+        #
+        def clone_git_repo_on host, path, repository, opts = {}
+          opts = {:accept_all_exit_codes => true}.merge(opts)
           name          = repository[:name]
           repo          = repository[:path]
           rev           = repository[:rev]
@@ -142,33 +165,41 @@ module Beaker
 
           logger.notify("\n  * Clone #{repo} if needed")
 
-          on host, "test -d #{path} || mkdir -p #{path}"
-          on host, "test -d #{target} || #{clone_cmd}"
+          on host, "test -d #{path} || mkdir -p #{path}", opts
+          on host, "test -d #{target} || #{clone_cmd}", opts
 
           logger.notify("\n  * Update #{name} and check out revision #{rev}")
-
           commands = ["cd #{target}",
                       "remote rm origin",
                       "remote add origin #{repo}",
                       "fetch origin +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/*:refs/remotes/origin/*",
                       "clean -fdx",
                       "checkout -f #{rev}"]
-          on host, commands.join(" && git ")
+          on host, commands.join(" && git "), opts
+        end
 
+        # @see #find_git_repo_versions
+        # @note This assumes the target repository application
+        #   can be installed via an install.rb ruby script.
+        def install_from_git_on host, path, repository, opts = {}
+          opts = {:accept_all_exit_codes => true}.merge(opts)
+          clone_git_repo_on host, path, repository, opts
+          name          = repository[:name]
           logger.notify("\n  * Install #{name} on the system")
           # The solaris ruby IPS package has bindir set to /usr/ruby/1.8/bin.
           # However, this is not the path to which we want to deliver our
           # binaries. So if we are using solaris, we have to pass the bin and
           # sbin directories to the install.rb
+          target        = "#{path}/#{name}"
           install_opts = ''
-          install_opts = '--bindir=/usr/bin --sbindir=/usr/sbin' if
-            host['platform'].include? 'solaris'
+          install_opts = '--bindir=/usr/bin --sbindir=/usr/sbin' if host['platform'].include? 'solaris'
 
-            on host,  "cd #{target} && " +
-                      "if [ -f install.rb ]; then " +
-                      "ruby ./install.rb #{install_opts}; " +
-                      "else true; fi"
+          on host,  "cd #{target} && " +
+                    "if [ -f install.rb ]; then " +
+                    "ruby ./install.rb #{install_opts}; " +
+                    "else true; fi", opts
         end
+        alias_method :install_from_git, :install_from_git_on
 
         # @deprecated Use {#install_puppet_on} instead.
         def install_puppet(opts = {})
@@ -299,7 +330,7 @@ module Beaker
           opts[:puppet_agent_version] ||= opts[:version] #backwards compatability with old parameter name
 
           block_on hosts do |host|
-            host[:type] = 'aio' #we are installing agent, so we want aio type
+            add_role(host, 'aio') #we are installing agent, so we want aio role
             case host['platform']
             when /el-4|sles/
               # pe-only agent, get from dev repo
@@ -421,7 +452,7 @@ module Beaker
 
             puppet_pkg = opts[:version] ? "puppet-#{opts[:version]}" : 'puppet'
             host.install_package("#{puppet_pkg}")
-            configure_foss_defaults_on( host )
+            configure_type_defaults_on( host )
           end
         end
         alias_method :install_puppet_from_rpm, :install_puppet_from_rpm_on
@@ -455,7 +486,7 @@ module Beaker
             else
               host.install_package('puppet')
             end
-            configure_foss_defaults_on( host )
+            configure_type_defaults_on( host )
           end
         end
         alias_method :install_puppet_from_deb, :install_puppet_from_deb_on
@@ -491,7 +522,7 @@ module Beaker
               install_a_puppet_msi_on(host, opts)
 
             end
-            configure_foss_defaults_on( host )
+            configure_type_defaults_on( host )
           end
         end
         alias_method :install_puppet_from_msi, :install_puppet_from_msi_on
@@ -540,7 +571,7 @@ module Beaker
         def install_puppet_agent_from_msi_on(hosts, opts)
           block_on hosts do |host|
 
-            host[:type] = 'aio' #we are installing agent, so we want aio type
+            add_role(host, 'aio') #we are installing agent, so we want aio role
             is_config_32 = true == (host['ruby_arch'] == 'x86') || host['install_32'] || opts['install_32']
             should_install_64bit = host.is_x86_64? && !is_config_32
             arch = should_install_64bit ? 'x64' : 'x86'
@@ -564,26 +595,26 @@ module Beaker
               raise "Puppet #{version} at #{link} does not exist!"
             end
 
+
+            msi_download_path = "#{get_temp_path(host)}\\#{host['dist']}.msi"
+
             if host.is_cygwin?
-              dest = "#{host['dist']}.msi"
-              on host, "curl -O #{link}"
+              # NOTE: it is critical that -o be before -O on Windows
+              on host, "curl -o \"#{msi_download_path}\" -O #{link}"
 
               #Because the msi installer doesn't add Puppet to the environment path
               #Add both potential paths for simplicity
               #NOTE - this is unnecessary if the host has been correctly identified as 'foss' during set up
               puppetbin_path = "\"/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin\":\"/cygdrive/c/Program Files/Puppet Labs/Puppet/bin\""
               on host, %Q{ echo 'export PATH=$PATH:#{puppetbin_path}' > /etc/bash.bashrc }
-
-              on host, "cmd /C 'start /w msiexec.exe /qn /i #{dest}'"
             else
-              dest = "C:\\Windows\\Temp\\#{host['dist']}.msi"
-
-              on host, powershell("$webclient = New-Object System.Net.WebClient;  $webclient.DownloadFile('#{link}','#{dest}')")
-
-              on host, "start /w msiexec.exe /qn /i #{dest}"
+              on host, powershell("$webclient = New-Object System.Net.WebClient;  $webclient.DownloadFile('#{link}','#{msi_download_path}')")
             end
 
-            configure_foss_defaults_on( host )
+            opts = { :debug => host[:pe_debug] || opts[:pe_debug] }
+            install_msi_on(host, msi_download_path, {}, opts)
+
+            configure_type_defaults_on( host )
             if not host.is_cygwin?
               host.mkdir_p host['distmoduledir']
             end
@@ -657,7 +688,7 @@ module Beaker
               host.install_package("facter-#{facter_ver}")
               host.install_package("hiera-#{hiera_ver}")
 
-              configure_foss_defaults_on( host )
+              configure_type_defaults_on( host )
             end
           end
         end
@@ -679,7 +710,7 @@ module Beaker
           opts[:puppet_collection] = opts[:puppet_collection].upcase #needs to be upcase, more lovely consistency
           block_on hosts do |host|
 
-            host[:type] = 'aio' #we are installing agent, so we want aio type
+            add_role(host, 'aio') #we are installing agent, so we want aio role
 
             variant, version, arch, codename = host['platform'].to_array
             agent_version = opts[:puppet_agent_version] || 'latest'
@@ -694,7 +725,7 @@ module Beaker
 
             host.install_package(pkg_name)
 
-            configure_foss_defaults_on( host )
+            configure_type_defaults_on( host )
           end
         end
 
@@ -714,7 +745,7 @@ module Beaker
           block_on hosts do |host|
             host.install_package('puppet')
 
-            configure_foss_defaults_on(host)
+            configure_type_defaults_on(host)
           end
         end
 
@@ -808,7 +839,7 @@ module Beaker
               host.mkdir_p host.puppet[key] if host.puppet.has_key?(key)
             end
 
-            configure_foss_defaults_on( host )
+            configure_type_defaults_on( host )
           end
         end
         alias_method :install_puppet_from_gem,          :install_puppet_from_gem_on
@@ -847,7 +878,7 @@ module Beaker
             else
               raise "No repository installation step for #{variant} yet..."
             end
-            configure_foss_defaults_on( host )
+            configure_type_defaults_on( host )
           end
         end
         alias_method :install_puppetlabs_release_repo, :install_puppetlabs_release_repo_on
@@ -988,7 +1019,7 @@ module Beaker
 
             on host, find_and_sed
             on host, "apt-get update"
-            configure_foss_defaults_on( host )
+            configure_type_defaults_on( host )
 
           else
             raise "No repository installation step for #{variant} yet..."
@@ -1017,7 +1048,7 @@ module Beaker
           end
           find_command = "find /root/#{package_name} -type f -name '#{find_filename}' -exec #{find_command} {} \\;"
           on host, find_command
-          configure_foss_defaults_on( host )
+          configure_type_defaults_on( host )
         end
 
         # Install development repo of the puppet-agent on the given host(s).  Downloaded from 
@@ -1064,7 +1095,7 @@ module Beaker
             opts[:copy_base_local]    ||= File.join('tmp', 'repo_configs')
             opts[:copy_dir_external]  ||= File.join('/', 'root')
             opts[:puppet_collection] ||= 'PC1'
-            host[:type] = 'aio' #we are installing agent, so we want aio type
+            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
             copy_dir_local = File.join(opts[:copy_base_local], variant)
@@ -1113,11 +1144,12 @@ module Beaker
             when /^windows$/
               result = on host, "echo #{onhost_copied_file}"
               onhost_copied_file = result.raw_output.chomp
-              on host, Command.new("start /w #{onhost_copied_file}", [], { :cmdexe => true })
+              opts = { :debug => host[:pe_debug] || opts[:pe_debug] }
+              install_msi_on(host, onhost_copied_file, {}, opts)
             when /^osx$/
               host.install_package("#{mac_pkg_name}*")
             end
-            configure_foss_defaults_on( host )
+            configure_type_defaults_on( host )
           end
         end
         alias_method :install_puppetagent_dev_repo, :install_puppet_agent_dev_repo_on
@@ -1156,7 +1188,7 @@ module Beaker
             opts[:copy_base_local]    ||= File.join('tmp', 'repo_configs')
             opts[:copy_dir_external]  ||= File.join('/', 'root')
             opts[:puppet_collection] ||= 'PC1'
-            host[:type] = 'aio' #we are installing agent, so we want aio type
+            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
             copy_dir_local = File.join(opts[:copy_base_local], variant)
@@ -1171,6 +1203,7 @@ module Beaker
               if arch == 'x86_64'
                 arch = 'amd64'
               end
+              version = version[0,2] + '.' + version[2,2] if variant =~ /ubuntu/ && version =~ /\.{0}/
               release_file = "/repos/apt/#{codename}/pool/#{opts[:puppet_collection]}/p/puppet-agent/puppet-agent*#{arch}.deb"
               download_file = "puppet-agent-#{variant}-#{version}-#{arch}.tar.gz"
             when /^windows$/
@@ -1198,6 +1231,9 @@ module Beaker
             scp_to host, File.join(copy_dir_local, download_file), onhost_copy_base
 
             case variant
+            when /^(fedora-22)$/
+              on host, "tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}"
+              on host, "dnf --nogpgcheck localinstall -y #{onhost_copied_file}"
             when /^(fedora|el|centos)$/
               on host, "tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}"
               on host, "yum --nogpgcheck localinstall -y #{onhost_copied_file}"
@@ -1211,19 +1247,20 @@ module Beaker
             when /^windows$/
               result = on host, "echo #{onhost_copied_file}"
               onhost_copied_file = result.raw_output.chomp
-              on host, Command.new("start /w #{onhost_copied_file}", [], { :cmdexe => true })
+              opts = { :debug => host[:pe_debug] || opts[:pe_debug] }
+              install_msi_on(host, onhost_copied_file, {}, opts)
             when /^osx$/
               on host, "tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}"
               # move to better location
               on host, "mv #{onhost_copied_file}.dmg ."
               host.install_package("puppet-agent-*")
             end
-            configure_foss_defaults_on( host )
+            configure_type_defaults_on( host )
           end
         end
 
 
-        # This method will install a pem file certifcate on a windows host
+        # This method will install a pem file certificate on a windows host
         #
         # @param [Host] host                 A host object
         # @param [String] cert_name          The name of the pem file