beaker 1.21.0 → 2.0.0

data/lib/beaker/hypervisor/docker.rb

@@ -8,7 +8,7 @@ module Beaker
       @hosts = hosts
 
       # increase the http timeouts as provisioning images can be slow
-      ::Docker.options = { :write_timeout => 300, :read_timeout => 300 }
+      ::Docker.options = { :write_timeout => 300, :read_timeout => 300 }.merge(::Docker.options || {})
       # assert that the docker-api gem can talk to your docker
       # enpoint.  Will raise if there is a version mismatch
       ::Docker.validate_version!
@@ -111,11 +111,18 @@ module Beaker
       # add platform-specific actions
       case host['platform']
       when /ubuntu/, /debian/
+        sshd_options = '-o "PermitRootLogin yes" -o "PasswordAuthentication yes"'
         dockerfile += <<-EOF
           RUN apt-get update
           RUN apt-get install -y openssh-server openssh-client #{Beaker::HostPrebuiltSteps::DEBIAN_PACKAGES.join(' ')}
         EOF
-      when /^el-/, /centos/, /fedora/, /redhat/
+        when  /cumulus/
+          sshd_options = '-o "PermitRootLogin yes" -o "PasswordAuthentication yes"'
+          dockerfile += <<-EOF
+          RUN apt-get update
+          RUN apt-get install -y openssh-server openssh-client #{Beaker::HostPrebuiltSteps::CUMULUS_PACKAGES.join(' ')}
+        EOF
+      when /^el-/, /centos/, /fedora/, /redhat/, /eos/
         dockerfile += <<-EOF
           RUN yum clean all
           RUN yum install -y sudo openssh-server openssh-clients #{Beaker::HostPrebuiltSteps::UNIX_PACKAGES.join(' ')}
@@ -145,6 +152,11 @@ module Beaker
         "RUN #{command}\n"
       }.join('')
 
+      # Override image entrypoint
+      if host['docker_image_entrypoint']
+        dockerfile += "ENTRYPOINT #{host['docker_image_entrypoint']}\n"
+      end
+
       # How to start a sshd on port 22.  May be an init for more supervision
       cmd = host['docker_cmd'] || "/usr/sbin/sshd -D #{sshd_options}"
       dockerfile += <<-EOF

data/lib/beaker/hypervisor/ec2_helper.rb

@@ -3,13 +3,16 @@ module Beaker
     # Return a list of open ports for testing based on a hosts role
     #
     # @todo horribly hard-coded
-    # @param [Array<String>] roles An array of roles
+    # @param [Host] host to find ports for
     # @return [Array<Number>] array of port numbers
     # @api private
-    def self.amiports(roles)
+    def self.amiports(host)
       ports = [22, 61613, 8139]
 
+      roles = host['roles']
+
       if roles.include? 'database'
+        ports << 5432
         ports << 8080
         ports << 8081
       end
@@ -20,10 +23,19 @@ module Beaker
 
       if roles.include? 'dashboard'
         ports << 443
+        ports << 4433
         ports << 4435
       end
 
-      ports
+      # If they only specified one port in the host config file, YAML will have converted it
+      # into a string, but if it was more than one, an array.
+      user_ports = []
+      if host.has_key?('additional_ports')
+        user_ports = host['additional_ports'].is_a?(Array) ? host['additional_ports'] : [host['additional_ports']]
+      end
+
+      additional_ports = ports + user_ports
+      additional_ports.uniq
     end
   end
 end

data/lib/beaker/hypervisor/vagrant.rb

@@ -58,14 +58,17 @@ module Beaker
     def set_ssh_config host, user
         f = Tempfile.new("#{host.name}")
         ssh_config = Dir.chdir(@vagrant_path) do
-          result = `vagrant ssh-config #{host.name}`
-          if $?.to_i != 0
-            raise "Failed to vagrant ssh-config for #{host.name}"
+          stdin, stdout, stderr, wait_thr = Open3.popen3('vagrant', 'ssh-config', host.name)
+          if not wait_thr.value.success?
+            raise "Failed to 'vagrant ssh-config' for #{host.name}"
           end
-          result
+          stdout.read
         end
         #replace hostname with ip
         ssh_config = ssh_config.gsub(/#{host.name}/, host['ip']) unless not host['ip']
+        if host['platform'] =~ /windows/
+          ssh_config = ssh_config.gsub(/127\.0\.0\.1/, host['ip']) unless not host['ip']
+        end
         #set the user
         ssh_config = ssh_config.gsub(/User vagrant/, "User #{user}")
         f.write(ssh_config)
@@ -128,7 +131,10 @@ module Beaker
 
         set_ssh_config host, 'vagrant'
 
+        #copy vagrant's keys to roots home dir, to allow for login as root
         copy_ssh_to_root host, @options
+        #ensure that root login is enabled for this host
+        enable_root_login host, @options
         #shut down connection, will reconnect on next exec
         host.close
 
@@ -151,12 +157,18 @@ module Beaker
 
     def vagrant_cmd(args)
       Dir.chdir(@vagrant_path) do
-        result = `vagrant #{args} 2>&1`
-        result.each_line do |line|
-          @logger.debug(line)
-        end
-        if $?.to_i != 0
-          raise "Failed to exec 'vagrant #{args}'"
+        exit_status = 1
+        Open3.popen3("vagrant #{args}") {|stdin, stdout, stderr, wait_thr|
+          while line = stdout.gets
+            @logger.info(line)
+          end
+          if not wait_thr.value.success?
+            raise "Failed to exec 'vagrant #{args}'"
+          end
+          exit_status = wait_thr.value
+        }
+        if exit_status != 0
+          raise "Failed to execute vagrant_cmd ( #{args} )"
         end
       end
     end

data/lib/beaker/hypervisor/vagrant_libvirt.rb

@@ -0,0 +1,11 @@
+require 'beaker/hypervisor/vagrant'
+
+class Beaker::VagrantLibvirt < Beaker::Vagrant
+  def provision(provider = 'libvirt')
+    super
+  end
+
+  def self.provider_vfile_section(host, options)
+    "    v.vm.provider :libvirt"
+  end
+end

data/lib/beaker/hypervisor/vagrant_virtualbox.rb

@@ -9,6 +9,7 @@ class Beaker::VagrantVirtualbox < Beaker::Vagrant
     provider_section  = ""
     provider_section << "    v.vm.provider :virtualbox do |vb|\n"
     provider_section << "      vb.customize ['modifyvm', :id, '--memory', '#{options['vagrant_memsize'] ||= '1024'}']\n"
+    provider_section << "      vb.vbguest.auto_update = false" if options[:vbguest_plugin] == 'disable'
     if host['disk_path']
       unless File.exist?(host['disk_path'])
         host['disk_path'] = File.join(host['disk_path'], "#{host.name}.vmdk")
@@ -17,7 +18,6 @@ class Beaker::VagrantVirtualbox < Beaker::Vagrant
       provider_section << "      vb.customize ['storageattach', :id, '--storagectl', 'SATA Controller', '--port', 1, '--device', 0, '--type', 'hdd', '--medium','#{host['disk_path']}']\n"
       provider_section << "      vb.customize [\"modifyvm\", :id, \"--natdnshostresolver1\", \"#{host['natdns']}\"]\n" unless host['natdns'].nil?
       provider_section << "      vb.customize [\"modifyvm\", :id, \"--natdnsproxy1\", \"#{host['natdns']}\"]\n" unless host['natdns'].nil?
-      provider_section << "    end\n"
     end
     provider_section << "    end\n"
 

data/lib/beaker/hypervisor/vcloud_pooled.rb

@@ -19,37 +19,12 @@ module Beaker
       @options = options
       @logger = options[:logger]
       @hosts = vcloud_hosts
-      @credentials = load_credentials(@options[:dot_fog])
 
       raise 'You must specify a datastore for vCloud instances!' unless @options['datastore']
       raise 'You must specify a resource pool for vCloud instances!' unless @options['resourcepool']
       raise 'You must specify a folder for vCloud instances!' unless @options['folder']
     end
 
-    def load_credentials(dot_fog = '.fog')
-      creds = {}
-
-      if fog = read_fog_file(dot_fog)
-        if fog[:default] && fog[:default][:vmpooler_token]
-          creds[:vmpooler_token] = fog[:default][:vmpooler_token]
-        else
-          @logger.warn "Credentials file (#{dot_fog}) is missing a :default section with a :vmpooler_token value; proceeding without authentication"
-        end
-      else
-        @logger.warn "Credentials file (#{dot_fog}) is empty; proceeding without authentication"
-      end
-
-      creds
-
-    rescue Errno::ENOENT
-      @logger.warn "Credentials file (#{dot_fog}) not found; proceeding without authentication"
-      creds
-    end
-
-    def read_fog_file(dot_fog = '.fog')
-      YAML.load_file(dot_fog)
-    end
-
     def check_url url
       begin
         URI.parse(url)
@@ -77,7 +52,6 @@ module Beaker
 
     def provision
       start = Time.now
-      try = 1
       @hosts.each_with_index do |h, i|
         if not h['template']
           raise ArgumentError, "You must specify a template name for #{h}"
@@ -89,22 +63,19 @@ module Beaker
 
         @logger.notify "Requesting '#{h['template']}' VM from vCloud host pool"
 
+        last_wait, wait = 0, 1
+        waited = 0 #the amount of time we've spent waiting for this host to provision
         begin
           uri = URI.parse(get_template_url(@options['pooling_api'], h['template']))
 
           http = Net::HTTP.new( uri.host, uri.port )
           request = Net::HTTP::Post.new(uri.request_uri)
 
-          if @credentials[:vmpooler_token]
-            request['X-AUTH-TOKEN'] = @credentials[:vmpooler_token]
-          end
-
           request.set_form_data({'pool' => @options['resourcepool'], 'folder' => 'foo'})
 
-          attempts = @options[:timeout].to_i / 5
           response = http.request(request)
           parsed_response = JSON.parse(response.body)
-          if parsed_response[h['template']] && parsed_response['ok'] && parsed_response[h['template']]['hostname']
+          if parsed_response[h['template']] && parsed_response[h['template']]['ok'] && parsed_response[h['template']]['hostname']
             hostname = parsed_response[h['template']]['hostname']
             domain = parsed_response['domain']
             h['vmhostname'] = domain ? "#{hostname}.#{domain}" : hostname
@@ -112,9 +83,11 @@ module Beaker
             raise "VcloudPooled.provision - no vCloud host free for #{h.name} in pool"
           end
         rescue JSON::ParserError, RuntimeError, *SSH_EXCEPTIONS => e
-          if try <= attempts
-            sleep 5
-            try += 1
+          if waited <= @options[:timeout].to_i
+            @logger.debug("Retrying provision for vCloud host #{h.name} after waiting #{wait} second(s) (failed with #{e.class})")
+            sleep wait
+            waited += wait
+            last_wait, wait = wait, last_wait + wait
             retry
           end
           report_and_raise(@logger, e, 'vCloudPooled.provision')
@@ -141,10 +114,6 @@ module Beaker
         http = Net::HTTP.new( uri.host, uri.port )
         request = Net::HTTP::Delete.new(uri.request_uri)
 
-        if @credentials[:vmpooler_token]
-          request['X-AUTH-TOKEN'] = @credentials[:vmpooler_token]
-        end
-
         begin
           response = http.request(request)
         rescue *SSH_EXCEPTIONS => e

data/lib/beaker/logger.rb

@@ -169,15 +169,9 @@ module Beaker
           convert s
         end
       else
-        if string.respond_to?( :force_encoding )
-          # We're running in >= 1.9 and we'll need to convert
-          # Remove invalid and undefined UTF-8 character encodings
-          string.force_encoding('UTF-8')
-          return string.chars.select{|i| i.valid_encoding?}.join
-        else
-          # We're running 1.8, do nothing
-          string
-        end
+        # Remove invalid and undefined UTF-8 character encodings
+        string.force_encoding('UTF-8')
+        return string.chars.select{|i| i.valid_encoding?}.join
       end
     end
 
@@ -306,6 +300,18 @@ module Beaker
       @sublog.read
     end
 
+    # Utility method to centralize dated log folder generation
+    #
+    # @param [String] base_dir path of the directory for the dated log folder to live in
+    # @param [Time] timestamp the timestamp that should be used to generate the dated log folder
+    #
+    # @return [String] the path of the dated log folder generated
+    def Logger.generate_dated_log_folder(base_dir, timestamp)
+      log_dir = File.join(base_dir, timestamp.strftime("%F_%H_%M_%S"))
+      FileUtils.mkdir_p(log_dir) unless File.directory?(log_dir)
+      log_dir
+    end
+
     private
     # Expand each symlink found to its full path
     # Lines are assumed to be in the format "String : Integer"

data/lib/beaker/network_manager.rb

@@ -75,10 +75,10 @@ module Beaker
 
     # configure proxy on all provioned machines
     #@raise [Exception] Raise an exception if virtual machines fail to be configured
-    def package_proxy
+    def proxy_package_manager
       if @hypervisors
         @hypervisors.each_key do |type|
-          @hypervisors[type].package_proxy
+          @hypervisors[type].proxy_package_manager
         end
       end
     end

data/lib/beaker/options/command_line_parser.rb

@@ -155,7 +155,7 @@ module Beaker
           end
 
           opts.on '--repo-proxy',
-                  'Proxy packaging repositories on ubuntu, debian and solaris-11',
+                  'Proxy packaging repositories on ubuntu, debian, cumulus and solaris-11',
                   '(default: false)' do
             @cmd_options[:repo_proxy] = true
           end

data/lib/beaker/options/parser.rb

@@ -11,7 +11,7 @@ module Beaker
       #These options expand out into an array of .rb files
       RB_FILE_OPTS = [:tests, :pre_suite, :post_suite]
 
-      PARSE_ERROR = if RUBY_VERSION > '1.8.7'; then Psych::SyntaxError; else ArgumentError; end
+      PARSE_ERROR = Psych::SyntaxError
 
       #The OptionsHash of all parsed options
       attr_accessor :options
@@ -240,7 +240,6 @@ module Beaker
       #  - --fail-mode is one of 'fast', 'stop' or nil
       #  - if using blimpy hypervisor an EC2 YAML file exists
       #  - if using the aix, solaris, or vcloud hypervisors a .fog file exists
-      #  - if using docker hypervisor are using RUBY 1.9+
       #  - that one and only one master is defined per set of hosts
       #  - that solaris/windows/aix hosts are agent only for PE tests OR
       #  - that windows/aix host are agent only if type is not 'pe'
@@ -307,12 +306,6 @@ module Beaker
             check_yaml_file(@options[:dot_fog], "required by #{visor}")
           end
         end
-        #if using docker need ruby 1.9+
-        if hypervisors.include?('docker')
-          if RUBY_VERSION < '1.9'
-            parser_error "Cannot use the 'docker' hypervisor on Ruby < 1.9 (using #{RUBY_VERSION})"
-          end
-        end
 
         #check that roles of hosts make sense
         # - must be one and only one master

data/lib/beaker/options/presets.rb

@@ -26,6 +26,7 @@ module Beaker
         :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'],
       }
 
       # Select all environment variables whose name matches provided regex
@@ -64,7 +65,19 @@ module Beaker
       # @return [Hash] Environment config values formatted appropriately
       def format_found_env_vars( found_env_vars )
         found_env_vars[:consoleport] &&= found_env_vars[:consoleport].to_i
-        found_env_vars[:type] = found_env_vars[:is_pe] == 'true' || found_env_vars[:is_pe] == 'yes' ? 'pe' : nil
+
+        if found_env_vars[:is_pe]
+          is_pe_val = found_env_vars[:is_pe]
+          type = case is_pe_val
+                 when /yes|true/ then 'pe'
+                 when /no|false/ then 'foss'
+                 else
+                   raise "Invalid value for one of #{ENVIRONMENT_SPEC[:is_pe].join(' ,')}: #{is_pe_val}"
+                 end
+
+          found_env_vars[:type] = type
+        end
+
         found_env_vars[:pe_version_file_win] = found_env_vars[:pe_version_file]
         found_env_vars
       end
@@ -96,45 +109,48 @@ module Beaker
       def presets
         h = Beaker::Options::OptionsHash.new
         h.merge({
-          :project              => 'Beaker',
-          :department           => ENV['USER'] || ENV['USERNAME'] || 'unknown',
-          :validate             => true,
-          :jenkins_build_url    => nil,
-          :log_level            => 'verbose',
-          :trace_limit          => 10,
-          :"master-start-curl-retries" => 120,
-          :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_stylesheet       => 'junit.xsl',
-          :log_dir              => 'log',
-          :color                => true,
-          :dry_run              => false,
-          :timeout              => 300,
-          :fail_mode            => 'slow',
-          :timesync             => false,
-          :disable_iptables     => false,
-          :repo_proxy           => false,
-          :package_proxy        => false,
-          :add_el_extras        => false,
-          :release_apt_repo_url => "http://apt.puppetlabs.com",
-          :release_yum_repo_url => "http://yum.puppetlabs.com",
-          :dev_builds_url       => "http://builds.delivery.puppetlabs.net",
-          :epel_url             => "http://mirrors.kernel.org/fedora-epel",
-          :epel_arch            => "i386",
-          :epel_6_pkg           => "epel-release-6-8.noarch.rpm",
-          :epel_5_pkg           => "epel-release-5-4.noarch.rpm",
-          :consoleport          => 443,
-          :pe_dir               => '/opt/enterprise/dists',
-          :pe_version_file      => 'LATEST',
-          :pe_version_file_win  => 'LATEST-win',
-          :answers              => {
+          :project                => 'Beaker',
+          :department             => ENV['USER'] || ENV['USERNAME'] || 'unknown',
+          :validate               => true,
+          :jenkins_build_url      => nil,
+          :log_level              => 'info',
+          :trace_limit            => 10,
+          :"master-start-curl-retries"  => 120,
+          :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_stylesheet         => 'junit.xsl',
+          :log_dir                => 'log',
+          :color                  => true,
+          :dry_run                => false,
+          :timeout                => 300,
+          :fail_mode              => 'slow',
+          :accept_all_exit_codes  => false,
+          :timesync               => false,
+          :disable_iptables       => false,
+          :repo_proxy             => false,
+          :package_proxy          => false,
+          :add_el_extras          => false,
+          :release_apt_repo_url   => "http://apt.puppetlabs.com",
+          :release_yum_repo_url   => "http://yum.puppetlabs.com",
+          :dev_builds_url         => "http://builds.delivery.puppetlabs.net",
+          :epel_url               => "http://mirrors.kernel.org/fedora-epel",
+          :epel_arch              => "i386",
+          :epel_6_pkg             => "epel-release-6-8.noarch.rpm",
+          :epel_5_pkg             => "epel-release-5-4.noarch.rpm",
+          :consoleport            => 443,
+          :pe_dir                 => '/opt/enterprise/dists',
+          :pe_version_file        => 'LATEST',
+          :pe_version_file_win    => 'LATEST-win',
+          :host_env               => {},
+          :ssh_env_file           => '~/.ssh/environment',
+          :answers                => {
                                      :q_puppet_enterpriseconsole_auth_user_email    => 'admin@example.com',
                                      :q_puppet_enterpriseconsole_auth_password      => '~!@#$%^*-/ aZ',
                                      :q_puppet_enterpriseconsole_smtp_port          => 25,
@@ -153,12 +169,21 @@ module Beaker
                                      :q_puppetdb_database_user                      => 'mYpdBu3r',
                                      :q_database_port                               => 5432,
                                      :q_puppetdb_port                               => 8081,
+                                     :q_classifier_database_user                    => 'DFGhjlkj',
+                                     :q_database_name                               => 'pe-classifier',
+                                     :q_classifier_database_password                => '~!@#$%^*-/ aZ',
+                                     :q_activity_database_user                      => 'adsfglkj',
+                                     :q_activity_database_name                      => 'pe-activity',
+                                     :q_activity_database_password                  => '~!@#$%^*-/ aZ',
+                                     :q_rbac_database_user                          => 'RbhNBklm',
+                                     :q_rbac_database_name                          => 'pe-rbac',
+                                     :q_rbac_database_password                      => '~!@#$%^*-/ aZ',
           },
-          :dot_fog              => File.join(ENV['HOME'], '.fog'),
-          :ec2_yaml             => 'config/image_templates/ec2.yaml',
-          :help                 => false,
-          :collect_perf_data   => false,
-          :ssh                  => {
+          :dot_fog                => File.join(ENV['HOME'], '.fog'),
+          :ec2_yaml               => 'config/image_templates/ec2.yaml',
+          :help                   => false,
+          :collect_perf_data      => false,
+          :ssh                    => {
                                      :config                => false,
                                      :paranoid              => false,
                                      :timeout               => 300,