beaker 2.39.0 → 2.40.0

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

@@ -133,7 +133,7 @@ module Beaker
           curl_retries = host['master-start-curl-retries'] || options['master-start-curl-retries']
           logger.debug "Setting curl retries to #{curl_retries}"
 
-          if options[:is_puppetserver]
+          if options[:is_puppetserver] || host[:is_puppetserver]
             confdir = host.puppet('master')['confdir']
             vardir = host.puppet('master')['vardir']
 

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

@@ -266,7 +266,7 @@ module Beaker
               elsif host['platform'] =~ /fedora-(\d+)/
                 relver = $1
                 install_puppet_from_rpm_on(host, opts.merge(:release => relver, :family => 'fedora'))
-              elsif host['platform'] =~ /(ubuntu|debian|cumulus)/
+              elsif host['platform'] =~ /(ubuntu|debian|cumulus|huaweios)/
                 install_puppet_from_deb_on(host, opts)
               elsif host['platform'] =~ /windows/
                 relver = opts[:version]
@@ -336,7 +336,7 @@ module Beaker
             when /el-|fedora|sles|centos|cisco_/
               package_name = 'puppet-agent'
               package_name << "-#{opts[:puppet_agent_version]}" if opts[:puppet_agent_version]
-            when /debian|ubuntu|cumulus/
+            when /debian|ubuntu|cumulus|huaweios/
               package_name = 'puppet-agent'
               package_name << "=#{opts[:puppet_agent_version]}-1#{host['platform'].codename}" if opts[:puppet_agent_version]
             when /windows/
@@ -696,22 +696,48 @@ module Beaker
             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'
-            pkg_name = "puppet-agent-#{agent_version}*"
-            if agent_version == 'latest'
-              dmg_name = "puppet-agent-#{agent_version}.dmg"
-              on host, "curl -O #{opts[:mac_download_url]}/#{dmg_name}"
-            else
-              dmg_name = "puppet-agent-#{agent_version}-osx-#{version}-x86_64.dmg"
-              on host, "curl -O #{opts[:mac_download_url]}/#{opts[:puppet_collection]}/#{dmg_name}"
+
+            download_url = "#{opts[:mac_download_url]}/#{version}/#{opts[:puppet_collection]}/#{arch}"
+
+            latest = get_latest_puppet_agent_build_from_url(download_url)
+
+            agent_version = opts[:puppet_agent_version] || latest
+            unless agent_version.length > 0
+              raise "no puppet-agent version specified or found on at #{download_url}"
             end
 
+            pkg_name = "puppet-agent-#{agent_version}*"
+            dmg_name = "puppet-agent-#{agent_version}-1.osx#{version}.dmg"
+            on host, "curl -O #{download_url}/#{dmg_name}"
+
             host.install_package(pkg_name)
 
             configure_type_defaults_on( host )
           end
         end
 
+        # Returns the latest puppet-agent version number from a given url.
+        #
+        # @param [String] url         URL containing list of puppet-agent packages.
+        #                             Example: https://downloads.puppetlabs.com/mac/10.11/PC1/x86_64
+        #
+        # @return [String] version    puppet-agent version number (e.g. 1.4.1)
+        #                             Empty string if none found.
+        # @api private
+        def get_latest_puppet_agent_build_from_url(url)
+          require 'nokogiri'
+          require 'open-uri'
+          page = Nokogiri::HTML(open("#{url}/?C=M;O=A"))
+          agents = page.css('a').children.select{ |link| link.to_s.include? 'puppet-agent' }
+          re =  /puppet-agent-(.*)-1/
+          latest_match = agents[-1].to_s.match re
+          if latest_match
+            latest = latest_match[1]
+          else
+            latest = ''
+          end
+        end
+
         # Installs Puppet and dependencies from OpenBSD packages
         #
         # @param [Host, Array<Host>, String, Symbol] hosts The host to install packages on
@@ -766,7 +792,7 @@ module Beaker
               gempkg = case host['platform']
                        when /solaris-11/                            then 'ruby-18'
                        when /ubuntu-14/                             then 'ruby'
-                       when /solaris-10|ubuntu|debian|el-|cumulus/  then 'rubygems'
+                       when /solaris-10|ubuntu|debian|el-|cumulus|huaweios/  then 'rubygems'
                        when /openbsd/                               then 'ruby'
                        else
                          raise "install_puppet() called with default_action " +
@@ -782,7 +808,7 @@ module Beaker
               on host, 'ln -s /opt/csw/bin/gem /usr/bin/gem'
             end
 
-            if host['platform'] =~ /debian|ubuntu|solaris|cumulus/
+            if host['platform'] =~ /debian|ubuntu|solaris|cumulus|huaweios/
               gem_env = YAML.load( on( host, 'gem environment' ).stdout )
               gem_paths_array = gem_env['RubyGems Environment'].find {|h| h['GEM PATHS'] != nil }['GEM PATHS']
               path_with_gem = 'export PATH=' + gem_paths_array.join(':') + ':${PATH}'
@@ -866,7 +892,7 @@ module Beaker
                   { :package_proxy => opts[:package_proxy] } )
               end
 
-            when /^(debian|ubuntu|cumulus)$/
+            when /^(debian|ubuntu|cumulus|huaweios)$/
               deb = "puppetlabs-release%s-%s.deb" % [repo_name, codename]
 
               remote = URI.join( opts[:release_apt_repo_url], deb )
@@ -907,7 +933,7 @@ module Beaker
           end
           scp_to( host, repo, to_path )
 
-          on( host, 'apt-get update' ) if host['platform'] =~ /ubuntu-|debian-|cumulus-/
+          on( host, 'apt-get update' ) if host['platform'] =~ /ubuntu-|debian-|cumulus-|huaweios-/
           nil
         end
 
@@ -942,7 +968,7 @@ module Beaker
                                   repo_configs_dir = nil,
                                   opts = options )
           variant, version, arch, codename = host['platform'].to_array
-          if variant !~ /^(fedora|el|centos|debian|ubuntu|cumulus|cisco_nexus|cisco_ios_xr)$/
+          if variant !~ /^(fedora|el|centos|debian|ubuntu|cumulus|huaweios|cisco_nexus|cisco_ios_xr)$/
             raise "No repository installation step for #{variant} yet..."
           end
           repo_configs_dir ||= 'tmp/repo_configs'
@@ -974,7 +1000,7 @@ module Beaker
         # @note This method is paired to be run directly after {#install_puppetlabs_dev_repo}
         #
         def install_packages_from_local_dev_repo( host, package_name )
-          if host['platform'] =~ /debian|ubuntu|cumulus/
+          if host['platform'] =~ /debian|ubuntu|cumulus|huaweios/
             find_filename = '*.deb'
             find_command  = 'dpkg -i'
           elsif host['platform'] =~ /fedora|el|centos/
@@ -1039,7 +1065,7 @@ module Beaker
             onhost_copy_base = opts[:copy_dir_external]
 
             case variant
-            when /^(fedora|el|centos|debian|ubuntu|cumulus|cisco_nexus|cisco_ios_xr)$/
+            when /^(fedora|el|centos|debian|ubuntu|cumulus|huaweios|cisco_nexus|cisco_ios_xr)$/
               sha = opts[:puppet_agent_sha] || opts[:puppet_agent_version]
               opts[:dev_builds_repos] ||= [ opts[:puppet_collection] ]
               install_puppetlabs_dev_repo( host, 'puppet-agent', sha, nil, opts )
@@ -1073,8 +1099,8 @@ module Beaker
             when /^windows$/
               result = on host, "echo #{onhost_copied_file}"
               onhost_copied_file = result.raw_output.chomp
-              opts = { :debug => host[:pe_debug] || opts[:pe_debug] }
-              install_msi_on(host, onhost_copied_file, {}, opts)
+              msi_opts = { :debug => host[:pe_debug] || opts[:pe_debug] }
+              install_msi_on(host, onhost_copied_file, {}, msi_opts)
             when /^osx$/
               host.install_package("puppet-agent-#{opts[:puppet_agent_version]}*")
             when /^solaris$/
@@ -1177,7 +1203,7 @@ module Beaker
             cmdline_args = ''
             # query packages
             case host[:platform]
-            when /cumulus/
+            when /cumulus|huaweios/
               pkgs = on(host, "dpkg-query -l  | awk '{print $2}' | grep -E '(^pe-|puppet)'", :acceptable_exit_codes => [0,1]).stdout.chomp.split(/\n+/)
             when /aix/
               pkgs = on(host, "rpm -qa  | grep -E '(^pe-|puppet)'", :acceptable_exit_codes => [0,1]).stdout.chomp.split(/\n+/)

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

@@ -140,6 +140,15 @@ exit /B %errorlevel%
             # if puppet service does not exist, pe-puppet is queried and that exit code is used
             # therefore, this command will always exit 0 if either service is installed
             on host, Command.new("sc query puppet || sc query pe-puppet", [], { :cmdexe => true })
+
+            # emit the misc/versions.txt file which contains component versions for
+            # puppet, facter, hiera, pxp-agent, packaging and vendored Ruby
+            [
+              "\"%ProgramFiles%\\Puppet Labs\\puppet\\misc\\versions.txt\"",
+              "\"%ProgramFiles(x86)%\\Puppet Labs\\puppet\\misc\\versions.txt\""
+            ].each do |path|
+              on host, Command.new("if exist #{path} type #{path}", [], { :cmdexe => true })
+            end
           end
         end
 

data/lib/beaker/host.rb

@@ -324,7 +324,8 @@ module Beaker
           # exit codes at the host level and then raising...
           # is it necessary to break execution??
           if options[:accept_all_exit_codes] && options[:acceptable_exit_codes]
-            @logger.warn ":accept_all_exit_codes & :acceptable_exit_codes set. :accept_all_exit_codes overrides, but they shouldn't both be set at once"
+            @logger.warn ":accept_all_exit_codes & :acceptable_exit_codes set. :acceptable_exit_codes overrides, but they shouldn't both be set at once"
+            options[:accept_all_exit_codes] = false
           end
           if !options[:accept_all_exit_codes] && !result.exit_code_in?(Array(options[:acceptable_exit_codes] || [0, nil]))
             raise CommandFailure, "Host '#{self}' exited with #{result.exit_code} running:\n #{cmdline}\nLast #{@options[:trace_limit]} lines of output were:\n#{result.formatted_output(@options[:trace_limit])}"

data/lib/beaker/host/unix/exec.rb

@@ -164,7 +164,7 @@ module Unix::Exec
   # @return [Result] result of restarting the SSH service
   def ssh_service_restart
     case self['platform']
-    when /debian|ubuntu|cumulus/
+    when /debian|ubuntu|cumulus|huaweios/
       exec(Beaker::Command.new("service ssh restart"))
     when /el-7|centos-7|redhat-7|oracle-7|scientific-7|eos-7/
       exec(Beaker::Command.new("systemctl restart sshd.service"))
@@ -188,7 +188,7 @@ module Unix::Exec
   #   (from {#ssh_service_restart}).
   def ssh_permit_user_environment
     case self['platform']
-    when /debian|ubuntu|cumulus/
+    when /debian|ubuntu|cumulus|huaweios/
       directory = create_tmpdir_on(self)
       exec(Beaker::Command.new("echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"))
       exec(Beaker::Command.new("mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"))

data/lib/beaker/host/unix/file.rb

@@ -41,7 +41,7 @@ module Unix::File
     case self['platform']
     when /fedora|el-|centos/
       '/etc/yum.repos.d/'
-    when /debian|ubuntu|cumulus/
+    when /debian|ubuntu|cumulus|huaweios/
       '/etc/apt/sources.list.d'
     else
       msg = "package config dir unknown for platform '#{self['platform']}'"
@@ -83,8 +83,8 @@ module Unix::File
         version,
         arch
       ]
-    when /debian|ubuntu|cumulus/
-      codename = variant if variant == 'cumulus'
+    when /debian|ubuntu|cumulus|huaweios/
+      codename = variant if variant == 'cumulus' || variant == 'huaweios'
       repo_filename << "%s.list" % [ codename ]
     else
       msg = "#repo_filename: repo filename pattern not known for platform '#{self['platform']}'"
@@ -103,7 +103,7 @@ module Unix::File
     case self['platform']
     when /fedora|el-|centos/
       'rpm'
-    when /debian|ubuntu|cumulus/
+    when /debian|ubuntu|cumulus|huaweios/
       'deb'
     else
       msg = "#repo_type: repo type not known for platform '#{self['platform']}'"

data/lib/beaker/host/unix/pkg.rb

@@ -34,7 +34,7 @@ module Unix::Pkg
         return false
       when /cisco|fedora|centos|eos|el-/
         result = execute("rpm -q #{name}", opts) { |result| result }
-      when /ubuntu|debian|cumulus/
+      when /ubuntu|debian|cumulus|huaweios/
         result = execute("dpkg -s #{name}", opts) { |result| result }
       when /solaris-11/
         result = execute("pkg info #{name}", opts) { |result| result }
@@ -54,7 +54,7 @@ module Unix::Pkg
   # If apt has not been updated since the last repo deployment it is
   # updated. Otherwise this is a noop
   def update_apt_if_needed
-    if self['platform'] =~ /debian|ubuntu|cumulus/
+    if self['platform'] =~ /debian|ubuntu|cumulus|huaweios/
       if @apt_needs_update
         execute("apt-get update")
         @apt_needs_update = false
@@ -78,7 +78,7 @@ module Unix::Pkg
           name = "#{name}-#{version}"
         end
         execute("yum -y #{cmdline_args} install #{name}", opts)
-      when /ubuntu|debian|cumulus/
+      when /ubuntu|debian|cumulus|huaweios/
         if version
           name = "#{name}=#{version}"
         end
@@ -152,7 +152,7 @@ module Unix::Pkg
         execute("dnf -y #{cmdline_args} remove #{name}", opts)
       when /cisco|fedora|centos|eos|el-/
         execute("yum -y #{cmdline_args} remove #{name}", opts)
-      when /ubuntu|debian|cumulus/
+      when /ubuntu|debian|cumulus|huaweios/
         execute("apt-get purge #{cmdline_args} -y #{name}", opts)
       when /solaris-11/
         execute("pkg #{cmdline_args} uninstall #{name}", opts)
@@ -180,7 +180,7 @@ module Unix::Pkg
         execute("dnf -y #{cmdline_args} update #{name}", opts)
       when /cisco|fedora|centos|eos|el-/
         execute("yum -y #{cmdline_args} update #{name}", opts)
-      when /ubuntu|debian|cumulus/
+      when /ubuntu|debian|cumulus|huaweios/
         update_apt_if_needed
         execute("apt-get install -o Dpkg::Options::='--force-confold' #{cmdline_args} -y --force-yes #{name}", opts)
       when /solaris-11/
@@ -257,7 +257,7 @@ module Unix::Pkg
         @logger.debug("Package repo deploy is not supported on rhel4")
       when /fedora|centos|eos|el-/
         deploy_yum_repo(path, name, version)
-      when /ubuntu|debian|cumulus/
+      when /ubuntu|debian|cumulus|huaweios/
         deploy_apt_repo(path, name, version)
       when /sles/
         deploy_zyp_repo(path, name, version)
@@ -317,6 +317,9 @@ module Unix::Pkg
     raise ArgumentError, error_message % "opts[:download_url]" unless opts[:download_url]
 
     variant, version, arch, codename = self['platform'].to_array
+
+    version = version.split('.')[0] # packages are only published for major versions
+
     platform_error = "Incorrect platform '#{variant}' for #solaris_puppet_agent_dev_package_info"
     raise ArgumentError, platform_error if variant != 'solaris'
 
@@ -488,6 +491,9 @@ module Unix::Pkg
   # @return [Beaker::Result] Result of installation command execution
   def solaris_install_local_package(package_path, noask_directory = nil)
     variant, version, arch, codename = self['platform'].to_array
+
+    version = version.split('.')[0] # packages are only published for major versions
+
     error_message = nil
     unless variant == 'solaris'
       error_message = "Can not call solaris_install_local_package for the "

data/lib/beaker/options/command_line_parser.rb

@@ -53,6 +53,11 @@ module Beaker
             @cmd_options[:post_suite] = value
           end
 
+          opts.on '--pre-cleanup /PRE-CLEANUP/DIR/PATH,/OPTIONAL/ADDITONAL/DIR/PATHS,/PATH/TO/FILE.rb',
+                  'Path to project specific steps to be run before cleaning up VMs (will always run)' do |value|
+            @cmd_options[:pre_cleanup] = value
+          end
+
           opts.on '--[no-]provision',
                   'Do not provision vm images before testing',
                   '(default: true)' do |bool|

data/lib/beaker/options/parser.rb

@@ -7,9 +7,9 @@ module Beaker
       GITREPO      = 'git://github.com/puppetlabs'
       #These options can have the form of arg1,arg2 or [arg] or just arg,
       #should default to []
-      LONG_OPTS    = [:helper, :load_path, :tests, :pre_suite, :post_suite, :install, :modules]
+      LONG_OPTS    = [:helper, :load_path, :tests, :pre_suite, :post_suite, :install, :pre_cleanup, :modules]
       #These options expand out into an array of .rb files
-      RB_FILE_OPTS = [:tests, :pre_suite, :post_suite]
+      RB_FILE_OPTS = [:tests, :pre_suite, :post_suite, :pre_cleanup]
 
       PARSE_ERROR = Psych::SyntaxError
 

data/lib/beaker/options/presets.rb

@@ -167,7 +167,7 @@ module Beaker
           :add_el_extras          => false,
           :epel_url               => "http://mirrors.kernel.org/fedora-epel",
           :epel_arch              => "i386",
-          :epel_7_pkg             => "epel-release-7-5.noarch.rpm",
+          :epel_7_pkg             => "epel-release-7-6.noarch.rpm",
           :epel_6_pkg             => "epel-release-6-8.noarch.rpm",
           :epel_5_pkg             => "epel-release-5-4.noarch.rpm",
           :consoleport            => 443,

data/lib/beaker/platform.rb

@@ -3,7 +3,7 @@ module Beaker
   # all String methods while adding several platform-specific use cases.
   class Platform < String
     # Supported platforms
-    PLATFORMS = /^(cisco_nexus|cisco_ios_xr|(free|open)bsd|osx|centos|fedora|debian|oracle|redhat|scientific|sles|ubuntu|windows|solaris|aix|el|eos|cumulus|f5|netscaler)\-.+\-.+$/
+    PLATFORMS = /^(huaweios|cisco_nexus|cisco_ios_xr|(free|open)bsd|osx|centos|fedora|debian|oracle|redhat|scientific|sles|ubuntu|windows|solaris|aix|el|eos|cumulus|f5|netscaler)\-.+\-.+$/
     # Platform version numbers vs. codenames conversion hash
     PLATFORM_VERSION_CODES =
       { :debian => { "jessie"  => "8",
@@ -43,6 +43,7 @@ module Beaker
     # Creates the Platform object.  Checks to ensure that the platform String
     # provided meets the platform formatting rules.  Platforms name must be of
     # the format /^OSFAMILY-VERSION-ARCH.*$/ where OSFAMILY is one of:
+    # * huaweios
     # * cisco_nexus
     # * cisco_ios_xr
     # * freebsd

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.39.0'
+    STRING = '2.40.0'
   end
 end

data/spec/beaker/cli_spec.rb

@@ -21,6 +21,20 @@ module Beaker
       end
 
       describe "test fail mode" do
+        it 'runs pre_cleanup after a failed pre_suite if using slow fail_mode' do
+          options = cli.instance_variable_get(:@options)
+          options[:fail_mode] = 'slow'
+          cli.instance_variable_set(:@options, options)
+          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_throw("bad test")
+          allow( cli ).to receive(:run_suite).with(:tests, options[:fail_mode])
+          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:pre_cleanup).and_return(true)
+
+          expect( cli ).to receive(:run_suite).exactly( 2 ).times
+          expect{ cli.execute! }.to raise_error
+
+        end
+
         it 'continues testing after failed test if using slow fail_mode' do
           options = cli.instance_variable_get(:@options)
           options[:fail_mode] = 'slow'
@@ -28,8 +42,9 @@ module Beaker
           allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
           allow( cli ).to receive(:run_suite).with(:tests, options[:fail_mode]).and_throw("bad test")
           allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:pre_cleanup).and_return(true)
 
-          expect( cli ).to receive(:run_suite).exactly( 3 ).times
+          expect( cli ).to receive(:run_suite).exactly( 4 ).times
           expect{ cli.execute! }.to raise_error
 
         end
@@ -40,9 +55,9 @@ module Beaker
           cli.instance_variable_set(:@options, options)
           allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
           allow( cli ).to receive(:run_suite).with(:tests, options[:fail_mode]).and_throw("bad test")
-          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:pre_cleanup).and_return(true)
 
-          expect( cli ).to receive(:run_suite).exactly( 2 ).times
+          expect( cli ).to receive(:run_suite).exactly( 3 ).times
           expect{ cli.execute! }.to raise_error
 
         end
@@ -56,7 +71,7 @@ module Beaker
           cli.instance_variable_set(:@options, options)
           allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
           allow( cli ).to receive(:run_suite).with(:tests, options[:fail_mode]).and_throw("bad test")
-          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:pre_cleanup).and_return(true)
 
           netmanager = double(:netmanager)
           cli.instance_variable_set(:@network_manager, netmanager)
@@ -74,6 +89,7 @@ module Beaker
           allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
           allow( cli ).to receive(:run_suite).with(:tests, options[:fail_mode]).and_return(true)
           allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:pre_cleanup).and_return(true)
 
           netmanager = double(:netmanager)
           cli.instance_variable_set(:@network_manager, netmanager)
@@ -94,6 +110,7 @@ module Beaker
           allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
           allow( cli ).to receive(:run_suite).with(:tests, options[:fail_mode]).and_return(true)
           allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:pre_cleanup).and_return(true)
           cli.instance_variable_set(:@hosts, {})
 
           netmanager = double(:netmanager)
@@ -112,6 +129,7 @@ module Beaker
           allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
           allow( cli ).to receive(:run_suite).with(:tests, options[:fail_mode]).and_throw("bad test")
           allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:pre_cleanup).and_return(true)
 
           netmanager = double(:netmanager)
           cli.instance_variable_set(:@network_manager, netmanager)
@@ -128,6 +146,7 @@ module Beaker
           allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
           allow( cli ).to receive(:run_suite).with(:tests, options[:fail_mode]).and_return(true)
           allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:pre_cleanup).and_return(true)
 
           netmanager = double(:netmanager)
           cli.instance_variable_set(:@network_manager, netmanager)
@@ -145,6 +164,7 @@ module Beaker
           allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
           allow( cli ).to receive(:run_suite).with(:tests, options[:fail_mode]).and_throw("bad test")
           allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:pre_cleanup).and_return(true)
 
           netmanager = double(:netmanager)
           cli.instance_variable_set(:@network_manager, netmanager)
@@ -162,6 +182,7 @@ module Beaker
           allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
           allow( cli ).to receive(:run_suite).with(:tests, options[:fail_mode]).and_throw("bad test")
           allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:pre_cleanup).and_return(true)
 
           netmanager = double(:netmanager)
           cli.instance_variable_set(:@network_manager, netmanager)
@@ -182,6 +203,7 @@ module Beaker
           allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
           allow( cli ).to receive(:run_suite).with(:tests, options[:fail_mode]).and_return(true)
           allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:pre_cleanup).and_return(true)
 
           netmanager = double(:netmanager)
           cli.instance_variable_set(:@network_manager, netmanager)
@@ -211,6 +233,7 @@ module Beaker
           options[:hosts_file] = 'sample.cfg'
           options[:pre_suite] = ['pre1', 'pre2', 'pre3']
           options[:post_suite] = ['post1']
+          options[:pre_cleanup] = ['preclean1']
           options[:tests] = ['test1', 'test2']
 
           cli.instance_variable_set(:@options, options)
@@ -221,6 +244,7 @@ module Beaker
           expect(hosts_yaml['CONFIG'][:tests]).to be == []
           expect(hosts_yaml['CONFIG'][:pre_suite]).to be == []
           expect(hosts_yaml['CONFIG'][:post_suite]).to be == []
+          expect(hosts_yaml['CONFIG'][:pre_cleanup]).to be == []
         end
       end
 
@@ -235,6 +259,7 @@ module Beaker
           allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
           allow( cli ).to receive(:run_suite).with(:tests, options[:fail_mode]).and_return(true)
           allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:pre_cleanup).and_return(true)
 
           hosts = [
             make_host('petey', { :hypervisor => 'peterPan' }),