beaker 4.40.1 → 5.0.0

data/lib/beaker/options/presets.rb

@@ -1,9 +1,8 @@
 module Beaker
   module Options
-    #A class representing the environment variables and preset argument values to be incorporated
-    #into the Beaker options Object.
+    # A class representing the environment variables and preset argument values to be incorporated
+    # into the Beaker options Object.
     class Presets
-
       # This is a constant that describes the variables we want to collect
       # from the environment. The keys correspond to the keys in
       # `presets` (flattened) The values are an optional array of
@@ -15,39 +14,37 @@ module Beaker
       # 'JOB_NAME' and 'BUILD_URL' envs are supplied by Jenkins
       # https://wiki.jenkins-ci.org/display/JENKINS/Building+a+software+project
       ENVIRONMENT_SPEC = {
-        :home                 => 'HOME',
-        :project              => ['BEAKER_PROJECT', 'BEAKER_project', 'JOB_NAME'],
-        :department           => ['BEAKER_DEPARTMENT', 'BEAKER_department'],
-        :jenkins_build_url    => ['BEAKER_BUILD_URL', 'BUILD_URL'],
-        :created_by           => ['BEAKER_CREATED_BY'],
-        :consoleport          => ['BEAKER_CONSOLEPORT', 'consoleport'],
-        :is_pe                => ['BEAKER_IS_PE', 'IS_PE'],
-        :pe_dir               => ['BEAKER_PE_DIR', 'pe_dist_dir'],
+        :home => 'HOME',
+        :project => %w[BEAKER_PROJECT BEAKER_project JOB_NAME],
+        :department => %w[BEAKER_DEPARTMENT BEAKER_department],
+        :jenkins_build_url => %w[BEAKER_BUILD_URL BUILD_URL],
+        :created_by => ['BEAKER_CREATED_BY'],
+        :consoleport => %w[BEAKER_CONSOLEPORT consoleport],
+        :is_pe => %w[BEAKER_IS_PE IS_PE],
+        :pe_dir => %w[BEAKER_PE_DIR pe_dist_dir],
         :puppet_agent_version => ['BEAKER_PUPPET_AGENT_VERSION'],
-        :puppet_agent_sha     => ['BEAKER_PUPPET_AGENT_SHA'],
-        :puppet_collection    => ['BEAKER_PUPPET_COLLECTION'],
-        :pe_version_file      => ['BEAKER_PE_VERSION_FILE', 'pe_version_file'],
-        :pe_ver               => ['BEAKER_PE_VER', 'pe_ver'],
-        :forge_host           => ['BEAKER_FORGE_HOST', 'forge_host'],
-        :package_proxy        => ['BEAKER_PACKAGE_PROXY'],
-        :release_apt_repo_url => ['BEAKER_RELEASE_APT_REPO', 'RELEASE_APT_REPO'],
-        :release_yum_repo_url => ['BEAKER_RELEASE_YUM_REPO', 'RELEASE_YUM_REPO'],
-        :dev_builds_url       => ['BEAKER_DEV_BUILDS_URL', 'DEV_BUILDS_URL'],
-        :vbguest_plugin       => ['BEAKER_VB_GUEST_PLUGIN', 'BEAKER_vb_guest_plugin'],
-        :test_tag_and         => ['BEAKER_TAG', 'BEAKER_TEST_TAG_AND'],
-        :test_tag_or          => ['BEAKER_TEST_TAG_OR'],
-        :test_tag_exclude     => ['BEAKER_EXCLUDE_TAG', 'BEAKER_TEST_TAG_EXCLUDE'],
-        :run_in_parallel      => ['BEAKER_RUN_IN_PARALLEL'],
+        :puppet_agent_sha => ['BEAKER_PUPPET_AGENT_SHA'],
+        :puppet_collection => ['BEAKER_PUPPET_COLLECTION'],
+        :pe_version_file => %w[BEAKER_PE_VERSION_FILE pe_version_file],
+        :pe_ver => %w[BEAKER_PE_VER pe_ver],
+        :forge_host => %w[BEAKER_FORGE_HOST forge_host],
+        :package_proxy => ['BEAKER_PACKAGE_PROXY'],
+        :release_apt_repo_url => %w[BEAKER_RELEASE_APT_REPO RELEASE_APT_REPO],
+        :release_yum_repo_url => %w[BEAKER_RELEASE_YUM_REPO RELEASE_YUM_REPO],
+        :dev_builds_url => %w[BEAKER_DEV_BUILDS_URL DEV_BUILDS_URL],
+        :vbguest_plugin => %w[BEAKER_VB_GUEST_PLUGIN BEAKER_vb_guest_plugin],
+        :test_tag_and => %w[BEAKER_TAG BEAKER_TEST_TAG_AND],
+        :test_tag_or => ['BEAKER_TEST_TAG_OR'],
+        :test_tag_exclude => %w[BEAKER_EXCLUDE_TAG BEAKER_TEST_TAG_EXCLUDE],
+        :run_in_parallel => ['BEAKER_RUN_IN_PARALLEL'],
       }
 
       # Select all environment variables whose name matches provided regex
       # @return [Hash] Hash of environment variables
       def select_env_by_regex regex
         envs = Beaker::Options::OptionsHash.new
-        ENV.each_pair do | k, v |
-          if /#{regex}/.match?(k.to_s)
-            envs[k] = v
-          end
+        ENV.each_pair do |k, v|
+          envs[k] = v if /#{regex}/.match?(k.to_s)
         end
         envs
       end
@@ -57,14 +54,12 @@ module Beaker
       # @param [Hash{Symbol=>Array,String}] env_var_spec  the spec of what env vars to search for
       #
       # @return [Hash] Found environment values
-      def collect_env_vars( env_var_spec )
-        env_var_spec.inject({}) do |memo, key_value|
+      def collect_env_vars(env_var_spec)
+        env_var_spec.each_with_object({}) do |key_value, memo|
           key, value = key_value[0], key_value[1]
 
-          set_env_var = Array(value).detect {|possible_variable| ENV[possible_variable] }
-          memo[key] = ENV[set_env_var] if set_env_var
-
-          memo
+          set_env_var = Array(value).detect { |possible_variable| ENV.fetch(possible_variable, nil) }
+          memo[key] = ENV.fetch(set_env_var, nil) if set_env_var
         end
       end
 
@@ -74,7 +69,7 @@ module Beaker
       # @param [Hash{Symbol=>String}] found_env_vars  Environment variables to munge
       #
       # @return [Hash] Environment config values formatted appropriately
-      def format_found_env_vars( found_env_vars )
+      def format_found_env_vars(found_env_vars)
         found_env_vars[:consoleport] &&= found_env_vars[:consoleport].to_i
 
         if found_env_vars[:is_pe]
@@ -88,9 +83,7 @@ module Beaker
 
           found_env_vars[:type] = type
         end
-        if found_env_vars[:run_in_parallel]
-          found_env_vars[:run_in_parallel] = found_env_vars[:run_in_parallel].split(',')
-        end
+        found_env_vars[:run_in_parallel] = found_env_vars[:run_in_parallel].split(',') if found_env_vars[:run_in_parallel]
 
         found_env_vars[:pe_version_file_win] = found_env_vars[:pe_version_file]
         found_env_vars
@@ -102,10 +95,10 @@ module Beaker
       #                       empty or nil environment variables are removed from the OptionsHash
       def calculate_env_vars
         found = Beaker::Options::OptionsHash.new
-        found = found.merge(format_found_env_vars( collect_env_vars( ENVIRONMENT_SPEC )))
+        found = found.merge(format_found_env_vars(collect_env_vars(ENVIRONMENT_SPEC)))
         found[:answers] = select_env_by_regex('\\Aq_')
 
-        found.delete_if {|_key, value| value.nil? or value.empty? }
+        found.delete_if { |_key, value| value.nil? or value.empty? }
         found
       end
 
@@ -123,88 +116,86 @@ module Beaker
       def presets
         h = Beaker::Options::OptionsHash.new
         h.merge({
-          :project                => 'Beaker',
-          :department             => 'unknown',
-          :created_by             => ENV['USER'] || ENV['USERNAME'] || 'unknown',
-          :host_tags              => {},
-          :openstack_api_key      => ENV['OS_PASSWORD'],
-          :openstack_username     => ENV['OS_USERNAME'],
-          :openstack_auth_url     => "#{ENV['OS_AUTH_URL']}/tokens",
-          :openstack_tenant       => ENV['OS_TENANT_NAME'],
-          :openstack_keyname      => ENV['OS_KEYNAME'],
-          :openstack_network      => ENV['OS_NETWORK'],
-          :openstack_region       => ENV['OS_REGION'],
-          :openstack_volume_support => ENV['OS_VOLUME_SUPPORT'] || true,
-          :jenkins_build_url      => nil,
-          :validate               => true,
-          :configure              => true,
-          :log_level              => 'info',
-          :trace_limit            => 10,
-          :"master-start-curl-retries"  => 120,
-          :masterless             => false,
-          :options_file           => nil,
-          :type                   => 'pe',
-          :provision              => true,
-          :preserve_hosts         => 'never',
-          :root_keys              => false,
-          :quiet                  => false,
-          :project_root           => File.expand_path(File.join(File.dirname(__FILE__), "../")),
-          :xml_dir                => 'junit',
-          :xml_file               => 'beaker_junit.xml',
-          :xml_time               => 'beaker_times.xml',
-          :xml_time_enabled       => false,
-          :xml_stylesheet         => 'junit.xsl',
-          :default_log_prefix     => 'beaker_logs',
-          :log_dir                => 'log',
-          :log_sut_event          => 'sut.log',
-          :color                  => true,
-          :dry_run                => false,
-          :test_tag_and           => '',
-          :test_tag_or            => '',
-          :test_tag_exclude       => '',
-          :timeout                => 900, # 15 minutes
-          :fail_mode              => 'slow',
-          :test_results_file      => '',
-          :accept_all_exit_codes  => false,
-          :timesync               => false,
-          :disable_iptables       => false,
-          :set_env                => true,
-          :disable_updates        => true,
-          :repo_proxy             => false,
-          :package_proxy          => false,
-          :add_el_extras          => false,
-          :epel_url               => "http://dl.fedoraproject.org/pub/epel",
-          :consoleport            => 443,
-          :pe_dir                 => '/opt/enterprise/dists',
-          :pe_version_file        => 'LATEST',
-          :pe_version_file_win    => 'LATEST-win',
-          :host_env               => {},
-          :host_name_prefix       => nil,
-          :ssh_env_file           => '~/.ssh/environment',
-          :profile_d_env_file     => '/etc/profile.d/beaker_env.sh',
-          :dot_fog                => File.join(ENV['HOME'], '.fog'),
-          :ec2_yaml               => 'config/image_templates/ec2.yaml',
-          :help                   => false,
-          :collect_perf_data      => 'none',
-          :puppetdb_port_ssl      => 8081,
-          :puppetdb_port_nonssl   => 8080,
-          :puppetserver_port      => 8140,
-          :nodeclassifier_port    => 4433,
-          :cache_files_locally    => false,
-          :aws_keyname_modifier   => rand(10 ** 10).to_s.rjust(10,'0'), # 10 digit random number string
-          :run_in_parallel        => [],
-          :use_fog_credentials    => true,
-          :ssh                    => {
-                                     :config                => false,
-                                     :verify_host_key       => false,
-                                     :auth_methods          => ["publickey"],
-                                     :port                  => 22,
-                                     :forward_agent         => true,
-                                     :keys                  => ["#{ENV['HOME']}/.ssh/id_rsa"],
-                                     :user_known_hosts_file => "#{ENV['HOME']}/.ssh/known_hosts",
-                                     :keepalive             => true
-          }
-        })
+                  :project => 'Beaker',
+                  :department => 'unknown',
+                  :created_by => ENV['USER'] || ENV['USERNAME'] || 'unknown',
+                  :host_tags => {},
+                  :openstack_api_key => ENV.fetch('OS_PASSWORD', nil),
+                  :openstack_username => ENV.fetch('OS_USERNAME', nil),
+                  :openstack_auth_url => "#{ENV.fetch('OS_AUTH_URL', nil)}/tokens",
+                  :openstack_tenant => ENV.fetch('OS_TENANT_NAME', nil),
+                  :openstack_keyname => ENV.fetch('OS_KEYNAME', nil),
+                  :openstack_network => ENV.fetch('OS_NETWORK', nil),
+                  :openstack_region => ENV.fetch('OS_REGION', nil),
+                  :openstack_volume_support => ENV['OS_VOLUME_SUPPORT'] || true,
+                  :jenkins_build_url => nil,
+                  :validate => true,
+                  :configure => true,
+                  :log_level => 'info',
+                  :trace_limit => 10,
+                  :"master-start-curl-retries" => 120,
+                  :masterless => false,
+                  :options_file => nil,
+                  :type => 'pe',
+                  :provision => true,
+                  :preserve_hosts => 'never',
+                  :root_keys => false,
+                  :quiet => false,
+                  :project_root => File.expand_path(File.join(__dir__, "../")),
+                  :xml_dir => 'junit',
+                  :xml_file => 'beaker_junit.xml',
+                  :xml_time => 'beaker_times.xml',
+                  :xml_time_enabled => false,
+                  :xml_stylesheet => 'junit.xsl',
+                  :default_log_prefix => 'beaker_logs',
+                  :log_dir => 'log',
+                  :log_sut_event => 'sut.log',
+                  :color => true,
+                  :dry_run => false,
+                  :test_tag_and => '',
+                  :test_tag_or => '',
+                  :test_tag_exclude => '',
+                  :timeout => 900, # 15 minutes
+                  :fail_mode => 'slow',
+                  :test_results_file => '',
+                  :accept_all_exit_codes => false,
+                  :timesync => false,
+                  :set_env => true,
+                  :disable_updates => true,
+                  :repo_proxy => false,
+                  :package_proxy => false,
+                  :add_el_extras => false,
+                  :consoleport => 443,
+                  :pe_dir => '/opt/enterprise/dists',
+                  :pe_version_file => 'LATEST',
+                  :pe_version_file_win => 'LATEST-win',
+                  :host_env => {},
+                  :host_name_prefix => nil,
+                  :ssh_env_file => '~/.ssh/environment',
+                  :profile_d_env_file => '/etc/profile.d/beaker_env.sh',
+                  :dot_fog => File.join(ENV.fetch('HOME', nil), '.fog'),
+                  :ec2_yaml => 'config/image_templates/ec2.yaml',
+                  :help => false,
+                  :collect_perf_data => 'none',
+                  :puppetdb_port_ssl => 8081,
+                  :puppetdb_port_nonssl => 8080,
+                  :puppetserver_port => 8140,
+                  :nodeclassifier_port => 4433,
+                  :cache_files_locally => false,
+                  :aws_keyname_modifier => rand(10**10).to_s.rjust(10, '0'), # 10 digit random number string
+                  :run_in_parallel => [],
+                  :use_fog_credentials => true,
+                  :ssh => {
+                    :config => false,
+                    :verify_host_key => false,
+                    :auth_methods => ["publickey"],
+                    :port => 22,
+                    :forward_agent => true,
+                    :keys => ["#{ENV.fetch('HOME', nil)}/.ssh/id_rsa"],
+                    :user_known_hosts_file => "#{ENV.fetch('HOME', nil)}/.ssh/known_hosts",
+                    :keepalive => true,
+                  },
+                })
       end
     end
   end

data/lib/beaker/options/subcommand_options_file_parser.rb

@@ -1,13 +1,10 @@
 module Beaker
   module Options
-    #A set of functions to read options files
+    # A set of functions to read options files
     module SubcommandOptionsParser
-
       def self.parse_options_file(options_file_path)
         result = OptionsHash.new
-        if File.exist?(options_file_path)
-          result = YAML.load_file(options_file_path)
-        end
+        result = YAML.load_file(options_file_path) if File.exist?(options_file_path)
         result
       end
 
@@ -17,11 +14,11 @@ module Beaker
         result = OptionsHash.new
         if Beaker::Subcommands::SubcommandUtil.execute_subcommand?(argv[0])
           return result if argv[0] == 'init'
+
           result = SubcommandOptionsParser.parse_options_file(options_file)
         end
         result
       end
-
     end
   end
 end

data/lib/beaker/options/validator.rb

@@ -1,6 +1,5 @@
 module Beaker
   module Options
-
     class Validator
       VALID_FAIL_MODES              = /stop|fast|slow/
       VALID_PRESERVE_HOSTS          = /always|onfail|onpass|never/
@@ -29,7 +28,7 @@ module Beaker
       end
 
       # alias to keep old methods and functionality from throwing errors.
-      alias_method :parser_error, :validator_error
+      alias parser_error validator_error
 
       # Raises an ArgumentError if more than one default exists,
       # otherwise returns true or false if default is set.
@@ -51,10 +50,10 @@ module Beaker
       # @param [String] fail_mode Failure mode setting
       # @return [nil] Does not return anything
       def validate_fail_mode(fail_mode)
-        #check for valid fail mode
-        unless fail_mode.is_a?(String) && VALID_FAIL_MODES.match?(fail_mode)
-          validator_error "--fail-mode must be one of fast or slow, not '#{fail_mode}'"
-        end
+        # check for valid fail mode
+        return if fail_mode.is_a?(String) && VALID_FAIL_MODES.match?(fail_mode)
+
+        validator_error "--fail-mode must be one of fast or slow, not '#{fail_mode}'"
       end
 
       # Raises an error if hosts_setting is not a supported preserve hosts value.
@@ -62,10 +61,10 @@ module Beaker
       # @param [String] hosts_setting Preserve hosts setting
       # @return [nil] Does not return anything
       def validate_preserve_hosts(hosts_setting)
-        #check for valid preserve_hosts option
-        unless hosts_setting.is_a?(String) && VALID_PRESERVE_HOSTS.match?(hosts_setting)
-          validator_error("--preserve_hosts must be one of always, onfail, onpass or never, not '#{hosts_setting}'")
-        end
+        # check for valid preserve_hosts option
+        return if hosts_setting.is_a?(String) && VALID_PRESERVE_HOSTS.match?(hosts_setting)
+
+        validator_error("--preserve_hosts must be one of always, onfail, onpass or never, not '#{hosts_setting}'")
       end
 
       # Raise an error if host does not have a platform defined.
@@ -74,9 +73,9 @@ module Beaker
       # @param [String] name Host name
       # @return [nil] Does not return anything
       def validate_platform(host, name)
-        if !host['platform'] || host['platform'].empty?
-          validator_error "Host #{name} does not have a platform specified"
-        end
+        return unless !host['platform'] || host['platform'].empty?
+
+        validator_error "Host #{name} does not have a platform specified"
       end
 
       # Raise an error if an item exists in both the include and exclude lists.
@@ -87,16 +86,12 @@ module Beaker
       # @param [Array] tags_exclude excluded items
       # @return [nil] Does not return anything
       def validate_test_tags(tags_and, tags_or, tags_exclude)
-        if tags_and.length > 0 && tags_or.length > 0
-          validator_error "cannot have values for both test tagging operands (AND and OR)"
-        end
+        validator_error "cannot have values for both test tagging operands (AND and OR)" if tags_and.length > 0 && tags_or.length > 0
 
         tags_and.each do |included_tag|
           # select items from exclude set that match included_tag
           # no match is an empty list/array/[]
-          if tags_exclude.select { |ex| ex == included_tag } != []
-            validator_error "tag '#{included_tag}' cannot be in both the included and excluded tag sets"
-          end
+          validator_error "tag '#{included_tag}' cannot be in both the included and excluded tag sets" if tags_exclude.select { |ex| ex == included_tag } != []
         end
       end
 
@@ -105,9 +100,9 @@ module Beaker
       # @param [Array<String>] role_array List of roles
       # @raise [ArgumentError] Raises if role_array contains conflicting roles
       def validate_frictionless_roles(role_array)
-        if role_array.include?(FRICTIONLESS_ROLE) and !(role_array & FRICTIONLESS_ADDITIONAL_ROLES).empty?
-          validator_error "Only agent nodes may have the role 'frictionless'."
-        end
+        return unless role_array.include?(FRICTIONLESS_ROLE) and !(role_array & FRICTIONLESS_ADDITIONAL_ROLES).empty?
+
+        validator_error "Only agent nodes may have the role 'frictionless'."
       end
 
       # Raise an error if the master count is incorrect.
@@ -116,9 +111,9 @@ module Beaker
       # @return [nil] Nothing is returned
       # @raise [ArgumentError] Raises if master count is greater than 1
       def validate_master_count(count)
-        if count > 1
-          validator_error("Only one host/node may have the role 'master'.")
-        end
+        return unless count > 1
+
+        validator_error("Only one host/node may have the role 'master'.")
       end
 
       # Raise an error if file_list is empty
@@ -127,9 +122,9 @@ module Beaker
       # @param [String] path file path to report in error
       # @raise [ArgumentError] Raises if file_list is empty
       def validate_files(file_list, path)
-        if file_list.empty?
-          validator_error("No files found for path: '#{path}'")
-        end
+        return unless file_list.empty?
+
+        validator_error("No files found for path: '#{path}'")
       end
 
       # Raise an error if path is not a valid file or directory
@@ -137,9 +132,9 @@ module Beaker
       # @param [String] path File path
       # @raise [ArgumentError] Raises if path is not a valid file or directory
       def validate_path(path)
-        if !File.file?(path) && !File.directory?(path)
-          validator_error("#{path} used as a file option but is not a file or directory!")
-        end
+        return unless !File.file?(path) && !File.directory?(path)
+
+        validator_error("#{path} used as a file option but is not a file or directory!")
       end
     end
   end

data/lib/beaker/perf.rb

@@ -1,7 +1,6 @@
 module Beaker
   # The Beaker Perf class. A single instance is created per Beaker run.
   class Perf
-
     PERF_PACKAGES = ['sysstat']
     # SLES does not treat sysstat as a service that can be started
     PERF_SUPPORTED_PLATFORMS = /debian|ubuntu|redhat|centos|oracle|scientific|fedora|el|eos|cumulus|opensuse|sles/
@@ -15,7 +14,7 @@ module Beaker
     # @param [Array<Host>] hosts All from the configuration
     # @param [Hash] options Options to alter execution
     # @return [void]
-    def initialize( hosts, options )
+    def initialize(hosts, options)
       @hosts = hosts
       @options = options
       @logger = options[:logger]
@@ -31,9 +30,7 @@ module Beaker
       # Install sysstat if required
       if PERF_SUPPORTED_PLATFORMS.match?(host['platform'])
         PERF_PACKAGES.each do |pkg|
-          if not host.check_for_package pkg
-            host.install_package pkg
-          end
+          host.install_package pkg if not host.check_for_package pkg
         end
       else
         @logger.perf_output("Perf (sysstat) not supported on host: " + host)
@@ -44,7 +41,7 @@ module Beaker
         host.exec(Command.new('sed -i s/ENABLED=\"false\"/ENABLED=\"true\"/ /etc/default/sysstat'))
       elsif /opensuse|sles/.match?(host['platform'])
         @logger.perf_output("Creating symlink from /etc/sysstat/sysstat.cron to /etc/cron.d")
-        host.exec(Command.new('ln -s /etc/sysstat/sysstat.cron /etc/cron.d'),:acceptable_exit_codes => [0,1])
+        host.exec(Command.new('ln -s /etc/sysstat/sysstat.cron /etc/cron.d'), :acceptable_exit_codes => [0, 1])
       end
       if @options[:collect_perf_data]&.include?('aggressive')
         @logger.perf_output("Enabling aggressive sysstat polling")
@@ -54,14 +51,14 @@ module Beaker
           host.exec(Command.new('sed -i s/*\\\/10/*/ /etc/cron.d/sysstat'))
         end
       end
-      if PERF_START_PLATFORMS.match?(host['platform']) # SLES doesn't need this step
-        host.exec(Command.new('service sysstat start'))
-      end
+      return unless PERF_START_PLATFORMS.match?(host['platform']) # SLES doesn't need this step
+
+      host.exec(Command.new('service sysstat start'))
     end
 
     # Iterate over all hosts, calling get_perf_data
     # @return [void]
-    def print_perf_info()
+    def print_perf_info
       @perf_end_timestamp = Time.now
       @hosts.map { |h| get_perf_data(h, @perf_timestamp, @perf_end_timestamp) }
     end
@@ -74,9 +71,7 @@ module Beaker
     def get_perf_data(host, perf_start, perf_end)
       @logger.perf_output("Getting perf data for host: " + host)
       if PERF_SUPPORTED_PLATFORMS.match?(host['platform']) # All flavours of Linux
-        if not @options[:collect_perf_data]&.include?('aggressive')
-          host.exec(Command.new("sar -A -s #{perf_start.strftime("%H:%M:%S")} -e #{perf_end.strftime("%H:%M:%S")}"),:acceptable_exit_codes => [0,1,2])
-        end
+        host.exec(Command.new("sar -A -s #{perf_start.strftime('%H:%M:%S')} -e #{perf_end.strftime('%H:%M:%S')}"), :acceptable_exit_codes => [0, 1, 2]) if not @options[:collect_perf_data]&.include?('aggressive')
         if (defined? @options[:graphite_server] and not @options[:graphite_server].nil?) and
            (defined? @options[:graphite_perf_data] and not @options[:graphite_perf_data].nil?)
           export_perf_data_to_graphite(host)
@@ -92,7 +87,7 @@ module Beaker
     def export_perf_data_to_graphite(host)
       @logger.perf_output("Sending data to Graphite server: " + @options[:graphite_server])
 
-      data = JSON.parse(host.exec(Command.new("sadf -j -- -A"),:silent => true).stdout)
+      data = JSON.parse(host.exec(Command.new("sadf -j -- -A"), :silent => true).stdout)
       hostname = host['vmhostname'].split('.')[0]
 
       data['sysstat']['hosts'].each do |host|
@@ -101,23 +96,23 @@ module Beaker
 
           poll.keys.each do |stat|
             case stat
-              when 'cpu-load-all'
-                poll[stat].each do |s|
-                  s.keys.each do |k|
-                    next if k == 'cpu'
-
-                    socket = TCPSocket.new(@options[:graphite_server], 2003)
-                    socket.puts "#{@options[:graphite_perf_data]}.#{hostname}.cpu.#{s['cpu']}.#{k} #{s[k]} #{timestamp}"
-                    socket.close
-                  end
-                end
+            when 'cpu-load-all'
+              poll[stat].each do |s|
+                s.keys.each do |k|
+                  next if k == 'cpu'
 
-              when 'memory'
-                poll[stat].keys.each do |s|
                   socket = TCPSocket.new(@options[:graphite_server], 2003)
-                  socket.puts "#{@options[:graphite_perf_data]}.#{hostname}.memory.#{s} #{poll[stat][s]} #{timestamp}"
+                  socket.puts "#{@options[:graphite_perf_data]}.#{hostname}.cpu.#{s['cpu']}.#{k} #{s[k]} #{timestamp}"
                   socket.close
                 end
+              end
+
+            when 'memory'
+              poll[stat].keys.each do |s|
+                socket = TCPSocket.new(@options[:graphite_server], 2003)
+                socket.puts "#{@options[:graphite_perf_data]}.#{hostname}.memory.#{s} #{poll[stat][s]} #{timestamp}"
+                socket.close
+              end
             end
           end
         end