beaker 2.1.0 → 2.2.0

data/lib/beaker/host.rb

@@ -48,7 +48,7 @@ module Beaker
       # a explict relationship between our defaults, our setup steps and how they're
       # related through 'type' and the differences between the assumption of our two
       # configurations we have for many of our products
-      type = is_pe? ? :pe : :foss
+      type = @options.get_type
       @defaults = merge_defaults_for_type @options, type
       pkg_initialize
     end
@@ -312,7 +312,7 @@ module Beaker
       ignore_re = nil
       if has_ignore
         ignore_arr = Array(options[:ignore]).map do |entry|
-          "((\/|\\A)#{entry}(\/|\\z))".sub(/\./, "\.")
+          "((\/|\\A)#{entry}(\/|\\z))".gsub(/\./, '\.')
         end
         ignore_re = Regexp.new(ignore_arr.join('|'))
       end
@@ -358,9 +358,9 @@ module Beaker
         dir_source.each do |s|
           s_path = Pathname.new(s)
           if s_path.absolute?
-            file_path = File.join(target, s.gsub(source,''))
+            file_path = File.join(target, File.dirname(s).gsub(source,''))
           else
-            file_path = File.join(target, s)
+            file_path = File.join(target, File.dirname(s))
           end
           result = connection.scp_to(s, file_path, options, $dry_run)
           @logger.trace result.stdout

data/lib/beaker/host/unix.rb

@@ -55,5 +55,16 @@ module Unix
         'pathseparator'     => ':',
       })
     end
+
+    def self.aio_defaults
+      h = self.foss_defaults
+      h['puppetbindir'] = '/opt/puppetlabs/agent/bin'
+      h['puppetpath'] = '/opt/puppetlabs/agent'
+      h['puppetvardir'] = '/opt/puppetlabs/agent/cache'
+      h['distmoduledir'] = '/opt/puppetlabs/agent/modules'
+      h['sitemoduledir'] = '/etc/puppetlabs/agent/modules'
+      h['hieraconf'] = ' /etc/puppetlabs/agent/hiera.conf'
+      h
+    end
   end
 end

data/lib/beaker/host_prebuilt_steps.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 [ 'command', "dsl/patterns" ].each do |lib|
   require "beaker/#{lib}"
 end
@@ -18,7 +20,7 @@ module Beaker
     ETC_HOSTS_PATH = "/etc/hosts"
     ETC_HOSTS_PATH_SOLARIS = "/etc/inet/hosts"
     ROOT_KEYS_SCRIPT = "https://raw.githubusercontent.com/puppetlabs/puppetlabs-sshkeys/master/templates/scripts/manage_root_authorized_keys"
-    ROOT_KEYS_SYNC_CMD = "curl -k -o - -L #{ROOT_KEYS_SCRIPT} %s"
+    ROOT_KEYS_SYNC_CMD = "curl -k -o - -L #{ROOT_KEYS_SCRIPT} | %s"
     APT_CFG = %q{ Acquire::http::Proxy "http://proxy.puppetlabs.net:3128/"; }
     IPS_PKG_REPO="http://solaris-11-internal-repo.delivery.puppetlabs.net"
 
@@ -126,18 +128,10 @@ module Beaker
       block_on host do |host|
       logger.notify "Sync root authorized_keys from github on #{host.name}"
         # Allow all exit code, as this operation is unlikely to cause problems if it fails.
-        if host['platform'].include? 'solaris'
-          host.exec(Command.new(ROOT_KEYS_SYNC_CMD % "| bash"), :acceptable_exit_codes => (0..255))
-        elsif host['platform'].include? 'eos'
-          # this is a terrible terrible thing that I'm already in the process of fixing
-          # the only reason that I include this terrible implementation is that the
-          # fix relies on changes in another repo, so I'm not sure how long it'll take
-          # to get those in
-          host.exec(Command.new(ROOT_KEYS_SYNC_CMD % "> manage_root_authorized_keys"), :acceptable_exit_codes => (0..255))
-          host.exec(Command.new("sed -i 's|mv -f $SSH_HOME/authorized_keys.tmp $SSH_HOME/authorized_keys|cp -f $SSH_HOME/authorized_keys.tmp $SSH_HOME/authorized_keys|' manage_root_authorized_keys"), :acceptable_exit_codes => (0..255))
-          host.exec(Command.new("bash manage_root_authorized_keys"), :acceptable_exit_codes => (0..255))
+        if host['platform'] =~ /solaris|eos/
+          host.exec(Command.new(ROOT_KEYS_SYNC_CMD % "bash"), :acceptable_exit_codes => (0..255))
         else
-          host.exec(Command.new(ROOT_KEYS_SYNC_CMD % "| env PATH=/usr/gnu/bin:$PATH bash"), :acceptable_exit_codes => (0..255))
+          host.exec(Command.new(ROOT_KEYS_SYNC_CMD % "env PATH=/usr/gnu/bin:$PATH bash"), :acceptable_exit_codes => (0..255))
         end
       end
     rescue => e
@@ -344,7 +338,7 @@ module Beaker
         if host['platform'] =~ /debian|ubuntu|cumulus/
           host.exec(Command.new("sudo su -c \"service ssh restart\""), {:pty => true})
         elsif host['platform'] =~ /centos|el-|redhat|fedora|eos/
-          host.exec(Command.new("sudo -E service sshd restart"))
+          host.exec(Command.new("sudo -E /sbin/service sshd restart"))
         else
           @logger.warn("Attempting to update ssh on non-supported platform: #{host.name}: #{host['platform']}")
         end
@@ -479,39 +473,44 @@ module Beaker
         logger.debug("setting local environment on #{host.name}")
         case host['platform']
         when /windows/
-          host.exec(Command.new("echo 'PermitUserEnvironment yes\n' >> /etc/sshd_config"))
+          host.exec(Command.new("echo '\nPermitUserEnvironment yes' >> /etc/sshd_config"))
           host.exec(Command.new("cygrunsrv -E sshd"))
           host.exec(Command.new("cygrunsrv -S sshd"))
           env['CYGWIN'] = 'nodosfilewarning'
         when /osx/
-          host.exec(Command.new("echo 'PermitUserEnvironment yes\n' >> /etc/sshd_config"))
+          host.exec(Command.new("echo '\nPermitUserEnvironment yes' >> /etc/sshd_config"))
           host.exec(Command.new("launchctl unload /System/Library/LaunchDaemons/ssh.plist"))
           host.exec(Command.new("launchctl load /System/Library/LaunchDaemons/ssh.plist"))
         when /debian|ubuntu|cumulus/
-          host.exec(Command.new("echo 'PermitUserEnvironment yes\n' >> /etc/ssh/sshd_config"))
+          host.exec(Command.new("echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
           host.exec(Command.new("service ssh restart"))
         when /el-|centos|fedora|redhat|oracle|scientific|eos/
-          host.exec(Command.new("echo 'PermitUserEnvironment yes\n' >> /etc/ssh/sshd_config"))
-          host.exec(Command.new("service sshd restart"))
+          host.exec(Command.new("echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
+          host.exec(Command.new("/sbin/service sshd restart"))
         when /sles/
-          host.exec(Command.new("echo 'PermitUserEnvironment yes\n' >> /etc/ssh/sshd_config"))
+          host.exec(Command.new("echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
           host.exec(Command.new("rcsshd restart"))
         when /solaris/
-          host.exec(Command.new("echo 'PermitUserEnvironment yes\n' >> /etc/ssh/sshd_config"))
+          host.exec(Command.new("echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
           host.exec(Command.new("svcadm restart svc:/network/ssh:default"))
         when /aix/
-          host.exec(Command.new("echo 'PermitUserEnvironment yes\n' >> /etc/ssh/sshd_config"))
+          host.exec(Command.new("echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
           host.exec(Command.new("stopsrc -g ssh"))
           host.exec(Command.new("startsrc -g ssh"))
         end
+
         #ensure that ~/.ssh/environment exists
+        host.exec(Command.new("mkdir -p #{Pathname.new(host[:ssh_env_file]).dirname}"))
+        host.exec(Command.new("chmod 0600 #{Pathname.new(host[:ssh_env_file]).dirname}"))
         host.exec(Command.new("touch #{host[:ssh_env_file]}"))
+
         #add the constructed env vars to this host
         host.add_env_var('RUBYLIB', '$RUBYLIB')
         host.add_env_var('PATH', '$PATH')
         env.each_pair do |var, value|
           host.add_env_var(var, value)
         end
+
         #close the host to re-establish the connection with the new sshd settings
         host.close
       end

data/lib/beaker/hypervisor.rb

@@ -95,6 +95,7 @@ module Beaker
     #Default configuration steps to be run for a given hypervisor.  Any additional configuration to be done
     #to the provided SUT for test execution to be successful.
     def configure
+      return unless @options[:configure]
       if @options[:timesync]
         timesync(@hosts, @options)
       end

data/lib/beaker/hypervisor/aws_sdk.rb

@@ -5,7 +5,7 @@ require 'beaker/hypervisor/ec2_helper'
 
 module Beaker
   # This is an alternate EC2 driver that implements direct API access using
-  # Amazon's AWS-SDK library: http://aws.amazon.com/documentation/sdkforruby/
+  # Amazon's AWS-SDK library: {http://aws.amazon.com/documentation/sdkforruby/ SDK For Ruby}
   #
   # It is built for full control, to reduce any other layers beyond the pure
   # vendor API.
@@ -116,7 +116,7 @@ module Beaker
     end
 
     # Provided an id return an instance object.
-    # Instance object will respond to methods described here: http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/EC2/Instance.html
+    # Instance object will respond to methods described here: {http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/EC2/Instance.html AWS Instance Object}.
     # @param [String] id The id of the instance to return
     # @return [AWS::EC2::Instance] An AWS::EC2 instance object
     def instance_by_id(id)
@@ -124,11 +124,42 @@ module Beaker
     end
 
     # Return all instances currently on ec2.
+    # @see AwsSdk#instance_by_id
     # @return [Array<AWS::EC2::Instance>] An array of AWS::EC2 instance objects
     def instances
       @ec2.instances
     end
 
+    # Provided an id return a VPC object.
+    # VPC object will respond to methods described here: {http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/EC2/VPC.html AWS VPC Object}.
+    # @param [String] id The id of the VPC to return
+    # @return [AWS::EC2::VPC] An AWS::EC2 vpc object
+    def vpc_by_id(id)
+      @ec2.vpcs[id]
+    end
+
+    # Return all VPCs currently on ec2.
+    # @see AwsSdk#vpc_by_id
+    # @return [Array<AWS::EC2::VPC>] An array of AWS::EC2 vpc objects
+    def vpcs
+      @ec2.vpcs
+    end
+
+    # Provided an id return a security group object
+    # Security object will respond to methods described here: {http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/EC2/SecurityGroup.html AWS SecurityGroup Object}.
+    # @param [String] id The id of the security group to return
+    # @return [AWS::EC2::SecurityGroup] An AWS::EC2 security group object
+    def security_group_by_id(id)
+      @ec2.security_groups[id]
+    end
+
+    # Return all security groups currently on ec2.
+    # @see AwsSdk#security_goup_by_id
+    # @return [Array<AWS::EC2::SecurityGroup>] An array of AWS::EC2 security group objects
+    def security_groups
+      @ec2.security_groups
+    end
+
     # Shutdown and destroy ec2 instances idenfitied by key that have been alive
     # longer than ZOMBIE hours.
     #
@@ -138,7 +169,6 @@ module Beaker
       @logger.notify("aws-sdk: Kill Zombies! (keyname: #{key}, age: #{max_age} hrs)")
       #examine all available regions
       kill_count = 0
-      volume_count = 0
       time_now = Time.now.getgm #ec2 uses GM time
       @ec2.regions.each do |region|
         @logger.debug "Reviewing: #{region.name}"
@@ -150,17 +180,28 @@ module Beaker
               @logger.debug "Examining #{instance.id} (keyname: #{instance.key_name}, launch time: #{instance.launch_time}, status: #{instance.status})"
               if ((time_now - instance.launch_time) >  max_age*60*60) and instance.status.to_s !~ /terminated/
                 @logger.debug "Kill! #{instance.id}: #{instance.key_name} (Current status: #{instance.status})"
-                  instance.terminate()
-                  kill_count += 1
+                instance.terminate()
+                kill_count += 1
               end
             end
           rescue AWS::Core::Resource::NotFound, AWS::EC2::Errors => e
             @logger.debug "Failed to remove instance: #{instance.id}, #{e}"
           end
         end
-        # Occasionaly, tearing down ec2 instances leaves orphaned EBS volumes behind -- these stack up quickly.
-        # This simply looks for EBS volumes that are not in use
-        # Note: don't use volumes.each here as that funtion doesn't allow proper rescue from error states
+      end
+
+      @logger.notify "#{key}: Killed #{kill_count} instance(s)"
+    end
+
+    # Destroy any volumes marked 'available', INCLUDING THOSE YOU DON'T OWN!  Use with care.
+    def kill_zombie_volumes
+      # Occasionaly, tearing down ec2 instances leaves orphaned EBS volumes behind -- these stack up quickly.
+      # This simply looks for EBS volumes that are not in use
+      # Note: don't use volumes.each here as that funtion doesn't allow proper rescue from error states
+      @logger.notify("aws-sdk: Kill Zombie Volumes!")
+      volume_count = 0
+      @ec2.regions.each do |region|
+        @logger.debug "Reviewing: #{region.name}"
         volumes = @ec2.regions[region.name].volumes.map { |vol| vol.id }
         volumes.each do |vol|
           begin
@@ -175,7 +216,7 @@ module Beaker
           end
         end
       end
-      @logger.notify "#{key}: Killed #{kill_count} instance(s), freed #{volume_count} volume(s)"
+      @logger.notify "Freed #{volume_count} volume(s)"
 
     end
 

data/lib/beaker/hypervisor/docker.rb

@@ -43,12 +43,15 @@ module Beaker
         end
         port = container.json["NetworkSettings"]["Ports"]["22/tcp"][0]["HostPort"]
 
+        forward_ssh_agent = @options[:forward_ssh_agent] || false
+
         # Update host metadata
         host['ip']  = ip
         host['port'] = port
         host['ssh']  = {
           :password => root_password,
           :port => port,
+          :forward_agent => forward_ssh_agent,
         }
 
         @logger.debug("node available as  ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@#{ip} -p #{port}")

data/lib/beaker/hypervisor/vagrant.rb

@@ -22,6 +22,7 @@ module Beaker
       #HACK HACK HACK - add checks here to ensure that we have box + box_url
       #generate the VagrantFile
       v_file = "Vagrant.configure(\"2\") do |c|\n"
+      v_file << "  c.ssh.forward_agent = true\n" if options[:forward_ssh_agent] == true
       hosts.each do |host|
         host['ip'] ||= randip #use the existing ip, otherwise default to a random ip
         v_file << "  c.vm.define '#{host.name}' do |v|\n"
@@ -30,8 +31,7 @@ module Beaker
         v_file << "    v.vm.box_url = '#{host['box_url']}'\n" unless host['box_url'].nil?
         v_file << "    v.vm.box_version = '#{host['box_version']}'\n" unless host['box_version'].nil?
         v_file << "    v.vm.box_check_update = '#{host['box_check_update'] ||= 'true'}'\n"
-        v_file << "    v.vm.base_mac = '#{randmac}'\n"
-        v_file << "    v.vm.network :private_network, ip: \"#{host['ip'].to_s}\", :netmask => \"#{host['netmask'] ||= "255.255.0.0"}\"\n"
+        v_file << "    v.vm.network :private_network, ip: \"#{host['ip'].to_s}\", :netmask => \"#{host['netmask'] ||= "255.255.0.0"}\", :mac => \"#{randmac}\"\n"
 
         if /windows/i.match(host['platform'])
           v_file << "    v.vm.network :forwarded_port, guest: 3389, host: 3389\n"
@@ -65,7 +65,7 @@ module Beaker
           stdout.read
         end
         #replace hostname with ip
-        ssh_config = ssh_config.gsub(/#{host.name}/, host['ip']) unless not host['ip']
+        ssh_config = ssh_config.gsub(/Host #{host.name}/, "Host #{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

data/lib/beaker/hypervisor/vsphere.rb

@@ -28,17 +28,19 @@ module Beaker
           raise "Couldn't find VM #{name} in vSphere!"
         end
 
-        snapshot = vsphere_helper.find_snapshot(vm, snap) or
-          raise "Could not find snapshot '#{snap}' for VM #{vm.name}!"
+        if snap
+          snapshot = vsphere_helper.find_snapshot(vm, snap) or
+            raise "Could not find snapshot '#{snap}' for VM #{vm.name}!"
 
-        @logger.notify "Reverting #{vm.name} to snapshot '#{snap}'"
-        start = Time.now
-        # This will block for each snapshot...
-        # The code to issue them all and then wait until they are all done sucks
-        snapshot.RevertToSnapshot_Task.wait_for_completion
+          @logger.notify "Reverting #{vm.name} to snapshot '#{snap}'"
+          start = Time.now
+          # This will block for each snapshot...
+          # The code to issue them all and then wait until they are all done sucks
+          snapshot.RevertToSnapshot_Task.wait_for_completion
 
-        time = Time.now - start
-        @logger.notify "Spent %.2f seconds reverting" % time
+          time = Time.now - start
+          @logger.notify "Spent %.2f seconds reverting" % time
+        end
 
         unless vm.runtime.powerState == "poweredOn"
           @logger.notify "Booting #{vm.name}"

data/lib/beaker/hypervisor/vsphere_helper.rb

@@ -36,7 +36,11 @@ class VsphereHelper
   end
 
   def find_snapshot vm, snapname
-    search_child_snaps vm.snapshot.rootSnapshotList, snapname
+    if vm.snapshot
+      search_child_snaps vm.snapshot.rootSnapshotList, snapname
+    else
+      raise "vm #{vm.name} has no snapshots to revert to"
+    end
   end
 
   def search_child_snaps tree, snapname

data/lib/beaker/logger.rb

@@ -171,7 +171,7 @@ module Beaker
       else
         # Remove invalid and undefined UTF-8 character encodings
         string.to_s.force_encoding('UTF-8')
-        return string.chars.select{|i| i.valid_encoding?}.join
+        return string.to_s.chars.select{|i| i.valid_encoding?}.join
       end
     end
 

data/lib/beaker/options/command_line_parser.rb

@@ -66,6 +66,12 @@ module Beaker
             @cmd_options[:provision] = bool
           end
 
+          opts.on '--[no-]configure',
+                  'Do not configure vm images before testing',
+                  '(default: true)' do |bool|
+            @cmd_options[:configure] = bool
+          end
+
           opts.on '--preserve-hosts [MODE]',
                   'How should SUTs be treated post test',
                   'Possible values:',
@@ -171,7 +177,7 @@ module Beaker
           end
 
           opts.on '--[no-]validate',
-                  'Validate that SUTs are correctly configured before running tests',
+                  'Validate that SUTs are correctly provisioned before running tests',
                   '(default: true)' do |bool|
             @cmd_options[:validate] = bool
           end

data/lib/beaker/options/options_hash.rb

@@ -51,6 +51,28 @@ module Beaker
         self[:type] ? self[:type] =~ /pe/ : true
       end
 
+      # Determine the puppet type of the ObjectHash
+      #
+      # Default is FOSS
+      #
+      # @example Use this method to test if the :type setting is pe
+      #     a['type'] = 'pe'
+      #     a.get_type == :pe
+      #
+      # @return [Symbol] the type given in the options
+      def get_type
+        case self[:type]
+        when /pe/
+          :pe
+        when /foss/
+          :foss
+        when /aio/
+          :aio
+        else
+          :foss
+        end
+      end
+
       # Determine if key is stored in ObjectHash
       # @param [Object] k The key to find in ObjectHash, searches for
       #                   both k as String and k as Symbol

data/lib/beaker/options/parser.rb

@@ -278,8 +278,8 @@ module Beaker
         end
 
         #check for valid type
-        if @options[:type] !~ /(pe)|(git)|(foss)/
-          parser_error "--type must be one of pe, git, or foss, not '#{@options[:type]}'"
+        if @options[:type] !~ /pe|git|foss|aio/
+          parser_error "--type must be one of pe, git, foss, or aio not '#{@options[:type]}'"
         end
 
         #check for valid fail mode

data/lib/beaker/options/presets.rb

@@ -115,6 +115,7 @@ module Beaker
           :created_by             => ENV['USER'] || ENV['USERNAME'] || 'unknown',
           :jenkins_build_url      => nil,
           :validate               => true,
+          :configure              => true,
           :log_level              => 'info',
           :trace_limit            => 10,
           :"master-start-curl-retries"  => 120,

data/lib/beaker/result.rb

@@ -33,7 +33,7 @@ module Beaker
     def convert string
       # Remove invalid and undefined UTF-8 character encodings
       string.to_s.force_encoding('UTF-8')
-      string.chars.select{|i| i.valid_encoding?}.join
+      string.to_s.chars.select{|i| i.valid_encoding?}.join
     end
 
     def log(logger)

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.1.0'
+    STRING = '2.2.0'
   end
 end