beaker 1.8.1 → 1.8.2

data/spec/beaker/hypervisor/google_compute.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+module Beaker
+  describe GoogleCompute do
+    let( :gc ) { Beaker::GoogleCompute.new( @hosts, make_opts ) }
+
+    before :each do
+      @hosts = make_hosts()
+      apiclient = double()
+
+    end
+
+    it "can provision hosts" do
+      gc.provision
+
+    end
+
+
+
+
+  end
+
+end

data/spec/beaker/hypervisor/vagrant_spec.rb

@@ -2,7 +2,8 @@ require 'spec_helper'
 
 module Beaker
   describe Vagrant do
-    let( :vagrant ) { Beaker::Vagrant.new( @hosts, make_opts ) }
+    let( :options ) { make_opts.merge({ 'logger' => double().as_null_object }) }
+    let( :vagrant ) { Beaker::Vagrant.new( @hosts, options ) }
 
     before :each do
       @hosts = make_hosts()
@@ -61,7 +62,7 @@ module Beaker
 
         Command.should_receive( :new ).with("sudo su -c \"cp -r .ssh /root/.\"").once
 
-        vagrant.copy_ssh_to_root( host )
+        vagrant.copy_ssh_to_root( host, options )
 
       end
 
@@ -71,7 +72,7 @@ module Beaker
 
         Command.should_receive( :new ).with("sudo su -c \"cp -r .ssh /home/Administrator/.\"").once
 
-        vagrant.copy_ssh_to_root( host )
+        vagrant.copy_ssh_to_root( host, options )
 
       end
     end
@@ -140,7 +141,7 @@ module Beaker
         @hosts.each do |host|
           host_prev_name = host['user']
           vagrant.should_receive( :set_ssh_config ).with( host, 'vagrant' ).once
-          vagrant.should_receive( :copy_ssh_to_root ).with( host ).once
+          vagrant.should_receive( :copy_ssh_to_root ).with( host, options ).once
           vagrant.should_receive( :set_ssh_config ).with( host, host_prev_name ).once
         end
         vagrant.should_receive( :hack_etc_hosts ).with( @hosts ).once

data/spec/beaker/hypervisor/vcloud_pooled_spec.rb

@@ -50,7 +50,7 @@ module Beaker
         vcloud.stub( :sleep ).and_return( true )
         vcloud.provision
 
-        hosts = vcloud.instance_variable_get( :@vcloud_hosts )
+        hosts = vcloud.instance_variable_get( :@hosts )
         hosts.each do | host |
           expect( host['vmhostname'] ).to be === 'pool'
         end
@@ -70,7 +70,7 @@ module Beaker
         vcloud.provision
         vcloud.cleanup
 
-        hosts = vcloud.instance_variable_get( :@vcloud_hosts )
+        hosts = vcloud.instance_variable_get( :@hosts )
         hosts.each do | host |
           name = host.name
           vm = MockVsphereHelper.find_vm( name )

data/spec/beaker/hypervisor/vcloud_spec.rb

@@ -29,7 +29,7 @@ module Beaker
         vcloud.stub( :sleep ).and_return( true )
         vcloud.provision
 
-        hosts = vcloud.instance_variable_get( :@vcloud_hosts )
+        hosts = vcloud.instance_variable_get( :@hosts )
         hosts.each do | host |
           name = host['vmhostname']
           vm = MockVsphereHelper.find_vm( name )
@@ -54,7 +54,7 @@ module Beaker
         vcloud.provision
         vcloud.cleanup
 
-        hosts = vcloud.instance_variable_get( :@vcloud_hosts )
+        hosts = vcloud.instance_variable_get( :@hosts )
         vm_names = hosts.map {|h| h['vmhostname'] }.compact
         vm_names.each do | name |
           vm = MockVsphereHelper.find_vm( name )

data/spec/beaker/hypervisor/vsphere_spec.rb

@@ -17,7 +17,7 @@ module Beaker
 
         vsphere.provision
 
-        hosts =  vsphere.instance_variable_get( :@vsphere_hosts )
+        hosts =  vsphere.instance_variable_get( :@hosts )
         hosts.each do |host|
           expect( MockVsphereHelper.find_vm( host.name ).powerState ) == "poweredOn"
         end
@@ -53,7 +53,7 @@ module Beaker
         vsphere = Beaker::Vsphere.new( make_hosts(), make_opts )
         vsphere.cleanup
 
-        hosts =  vsphere.instance_variable_get( :@vsphere_hosts )
+        hosts =  vsphere.instance_variable_get( :@hosts )
         hosts.each do |host|
           expect( MockVsphereHelper.find_vm( host.name ).powerState ) == "poweredOff"
         end

data/spec/beaker/options/parser_spec.rb

@@ -133,7 +133,7 @@ module Beaker
       it "can correctly combine arguments from different sources" do
         FakeFS.deactivate!
         args = ["-h", hosts_path, "--log-level", "debug", "--type", "git", "--install", "PUPPET/1.0,HIERA/hello"]
-        expect(parser.parse_args(args)).to be === {:log_level=>"debug", :trace_limit=>10, :hosts_file=>hosts_path, :options_file=>nil, :type=>"git", :provision=>true, :preserve_hosts=>'never', :root_keys=>false, :quiet=>false, :xml=>false, :color=>true, :dry_run=>false, :timeout=>300, :fail_mode=>'slow', :timesync=>false, :repo_proxy=>false, :add_el_extras=>false, :consoleport=>443, :pe_dir=>"/opt/enterprise/dists", :pe_version_file=>"LATEST", :pe_version_file_win=>"LATEST-win", :dot_fog=>"#{home}/.fog", :help=>false, :ec2_yaml=>"config/image_templates/ec2.yaml", :ssh=>{:config=>false, :paranoid=>false, :timeout=>300, :auth_methods=>["publickey"], :port=>22, :forward_agent=>true, :keys=>["#{home}/.ssh/id_rsa"], :user_known_hosts_file=>"#{home}/.ssh/known_hosts"}, :install=>["git://github.com/puppetlabs/puppet.git#1.0", "git://github.com/puppetlabs/hiera.git#hello"], :HOSTS=>{:"pe-ubuntu-lucid"=>{:roles=>["agent", "dashboard", "database", "master"], :vmname=>"pe-ubuntu-lucid", :platform=>"ubuntu-10.04-i386", :snapshot=>"clean-w-keys", :hypervisor=>"fusion"}, :"pe-centos6"=>{:roles=>["agent"], :vmname=>"pe-centos6", :platform=>"el-6-i386", :hypervisor=>"fusion", :snapshot=>"clean-w-keys"}}, :nfs_server=>"none", :helper=>[], :load_path=>[], :tests=>[], :pre_suite=>[], :post_suite=>[], :modules=>[]}
+        expect(parser.parse_args(args)).to be === {:log_level=>"debug", :trace_limit=>10, :hosts_file=>hosts_path, :options_file=>nil, :type=>"git", :provision=>true, :preserve_hosts=>'never', :root_keys=>false, :quiet=>false, :xml=>false, :color=>true, :dry_run=>false, :timeout=>300, :fail_mode=>'slow', :timesync=>false, :repo_proxy=>false, :add_el_extras=>false, :add_master_entry=>false, :consoleport=>443, :pe_dir=>"/opt/enterprise/dists", :pe_version_file=>"LATEST", :pe_version_file_win=>"LATEST-win", :dot_fog=>"#{home}/.fog", :help=>false, :ec2_yaml=>"config/image_templates/ec2.yaml", :ssh=>{:config=>false, :paranoid=>false, :timeout=>300, :auth_methods=>["publickey"], :port=>22, :forward_agent=>true, :keys=>["#{home}/.ssh/id_rsa"], :user_known_hosts_file=>"#{home}/.ssh/known_hosts"}, :install=>["git://github.com/puppetlabs/puppet.git#1.0", "git://github.com/puppetlabs/hiera.git#hello"], :HOSTS=>{:"pe-ubuntu-lucid"=>{:roles=>["agent", "dashboard", "database", "master"], :vmname=>"pe-ubuntu-lucid", :platform=>"ubuntu-10.04-i386", :snapshot=>"clean-w-keys", :hypervisor=>"fusion"}, :"pe-centos6"=>{:roles=>["agent"], :vmname=>"pe-centos6", :platform=>"el-6-i386", :hypervisor=>"fusion", :snapshot=>"clean-w-keys"}}, :nfs_server=>"none", :helper=>[], :load_path=>[], :tests=>[], :pre_suite=>[], :post_suite=>[], :modules=>[]}
       end
 
       it "ensures that fail-mode is one of fast/slow" do

data/spec/beaker/shared/host_role_parser_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+module Beaker
+  module Shared
+    describe HostRoleParser do
+      let( :host_handler )   { Beaker::Shared::HostRoleParser }
+      let( :platform )       { @platform || 'unix' }
+      let( :hosts )          { hosts = make_hosts( { :platform => platform } )
+                               hosts[0][:roles] = ['agent']
+                               hosts[1][:roles] = ['master', 'dashboard', 'agent', 'database']
+                               hosts[2][:roles] = ['agent']
+                               hosts }
+
+      context "hosts_with_role" do
+        it "can find the master in a set of hosts" do
+
+          expect( host_handler.hosts_with_role( hosts, 'master' ) ).to be === [hosts[1]]
+
+        end
+
+        it "can find all agents in a set of hosts" do
+
+          expect( host_handler.hosts_with_role( hosts, 'agent' ) ).to be === hosts
+
+        end
+
+        it "returns [] when no match is found in a set of hosts" do
+
+          expect( host_handler.hosts_with_role( hosts, 'surprise' ) ).to be === []
+
+        end
+
+      end
+
+      context "only_host_with_role" do
+        it "can find the single master in a set of hosts" do
+
+          expect( host_handler.only_host_with_role( hosts, 'master' ) ).to be === hosts[1]
+
+        end
+
+        it "throws an error when more than one host with matching role is found" do
+
+          expect{ host_handler.only_host_with_role( hosts, 'agent' ) }.to raise_error(ArgumentError)
+
+        end
+
+        it "throws an error when no host is found matching the role" do
+
+          expect{ host_handler.only_host_with_role( hosts, 'surprise' ) }.to raise_error(ArgumentError)
+
+        end
+      end
+
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -301,6 +301,7 @@ files:
 - lib/beaker/host/windows/group.rb
 - lib/beaker/host/windows/pkg.rb
 - lib/beaker/host/windows/user.rb
+- lib/beaker/host_prebuilt_steps.rb
 - lib/beaker/hypervisor.rb
 - lib/beaker/hypervisor/aixer.rb
 - lib/beaker/hypervisor/blimper.rb
@@ -325,17 +326,12 @@ files:
 - lib/beaker/result.rb
 - lib/beaker/shared.rb
 - lib/beaker/shared/error_handler.rb
-- lib/beaker/shared/host_handler.rb
+- lib/beaker/shared/host_role_parser.rb
 - lib/beaker/shared/repetition.rb
 - lib/beaker/shared/timed.rb
 - lib/beaker/ssh_connection.rb
 - lib/beaker/test_case.rb
 - lib/beaker/test_suite.rb
-- lib/beaker/utils.rb
-- lib/beaker/utils/ntp_control.rb
-- lib/beaker/utils/repo_control.rb
-- lib/beaker/utils/setup_helper.rb
-- lib/beaker/utils/validator.rb
 - lib/beaker/version.rb
 - spec/beaker/answers_spec.rb
 - spec/beaker/cli_spec.rb
@@ -348,10 +344,12 @@ files:
 - spec/beaker/dsl/structure_spec.rb
 - spec/beaker/dsl/wrappers_spec.rb
 - spec/beaker/host/windows/group_spec.rb
+- spec/beaker/host_prebuilt_steps_spec.rb
 - spec/beaker/host_spec.rb
 - spec/beaker/hypervisor/aixer_spec.rb
 - spec/beaker/hypervisor/blimper_spec.rb
 - spec/beaker/hypervisor/fusion_spec.rb
+- spec/beaker/hypervisor/google_compute.rb
 - spec/beaker/hypervisor/hypervisor_spec.rb
 - spec/beaker/hypervisor/solaris_spec.rb
 - spec/beaker/hypervisor/vagrant_spec.rb
@@ -374,15 +372,11 @@ files:
 - spec/beaker/platform_spec.rb
 - spec/beaker/puppet_command_spec.rb
 - spec/beaker/shared/error_handler_spec.rb
-- spec/beaker/shared/host_handler_spec.rb
+- spec/beaker/shared/host_role_parser_spec.rb
 - spec/beaker/shared/repetition_spec.rb
 - spec/beaker/ssh_connection_spec.rb
 - spec/beaker/test_case_spec.rb
 - spec/beaker/test_suite_spec.rb
-- spec/beaker/utils/ntp_control_spec.rb
-- spec/beaker/utils/repo_control_spec.rb
-- spec/beaker/utils/setup_helper_spec.rb
-- spec/beaker/utils/validator_spec.rb
 - spec/helpers.rb
 - spec/matchers.rb
 - spec/mock_blimpy.rb
@@ -427,10 +421,12 @@ test_files:
 - spec/beaker/dsl/structure_spec.rb
 - spec/beaker/dsl/wrappers_spec.rb
 - spec/beaker/host/windows/group_spec.rb
+- spec/beaker/host_prebuilt_steps_spec.rb
 - spec/beaker/host_spec.rb
 - spec/beaker/hypervisor/aixer_spec.rb
 - spec/beaker/hypervisor/blimper_spec.rb
 - spec/beaker/hypervisor/fusion_spec.rb
+- spec/beaker/hypervisor/google_compute.rb
 - spec/beaker/hypervisor/hypervisor_spec.rb
 - spec/beaker/hypervisor/solaris_spec.rb
 - spec/beaker/hypervisor/vagrant_spec.rb
@@ -453,15 +449,11 @@ test_files:
 - spec/beaker/platform_spec.rb
 - spec/beaker/puppet_command_spec.rb
 - spec/beaker/shared/error_handler_spec.rb
-- spec/beaker/shared/host_handler_spec.rb
+- spec/beaker/shared/host_role_parser_spec.rb
 - spec/beaker/shared/repetition_spec.rb
 - spec/beaker/ssh_connection_spec.rb
 - spec/beaker/test_case_spec.rb
 - spec/beaker/test_suite_spec.rb
-- spec/beaker/utils/ntp_control_spec.rb
-- spec/beaker/utils/repo_control_spec.rb
-- spec/beaker/utils/setup_helper_spec.rb
-- spec/beaker/utils/validator_spec.rb
 - spec/helpers.rb
 - spec/matchers.rb
 - spec/mock_blimpy.rb

data/lib/beaker/shared/host_handler.rb

@@ -1,51 +0,0 @@
-module Beaker 
-  module Shared
-    module HostHandler
-
-      # NOTE: this code is shamelessly stolen from facter's 'domain' fact, but
-      # we don't have access to facter at this point in the run.  Also, this
-      # utility method should perhaps be moved to a more central location in the
-      # framework.
-      def get_domain_name(host)
-        domain = nil
-        search = nil
-        resolv_conf = host.exec(Command.new("cat /etc/resolv.conf")).stdout
-        resolv_conf.each_line { |line|
-          if line =~ /^\s*domain\s+(\S+)/
-            domain = $1
-          elsif line =~ /^\s*search\s+(\S+)/
-            search = $1
-          end
-        }
-        return domain if domain
-        return search if search
-      end
-
-      def get_ip(host)
-        host.exec(Command.new("ip a|awk '/global/{print$2}' | cut -d/ -f1 | head -1")).stdout.chomp
-      end
-
-      def set_etc_hosts(host, etc_hosts)
-        host.exec(Command.new("echo '#{etc_hosts}' > /etc/hosts"))
-      end
-
-      def hosts_with_role(hosts, desired_role = nil)
-        hosts.select do |host|
-          desired_role.nil? or host['roles'].include?(desired_role.to_s)
-        end
-      end 
-
-      def only_host_with_role(hosts, role)
-        a_host = hosts_with_role(hosts, role)
-        case 
-          when a_host.length == 0
-            raise ArgumentError, "There should be one host with #{role} defined!"
-          when a_host.length > 1
-            host_string = ( a_host.map { |host| host.name } ).join( ', ')
-            raise ArgumentError, "There should be only one host with #{role} defined, but I found #{a_host.length} (#{host_string})" 
-        end
-        a_host.first 
-      end
-    end
-  end
-end

data/lib/beaker/utils.rb

@@ -1,7 +0,0 @@
-[ 'ntp_control', 'setup_helper', 'repo_control', 'validator' ].each do |file|
-  begin
-    require "beaker/utils/#{file}"
-  rescue LoadError
-    require File.expand_path(File.join(File.dirname(__FILE__), 'utils', file))
-  end
-end

data/lib/beaker/utils/ntp_control.rb

@@ -1,57 +0,0 @@
-module Beaker
-  module Utils
-    class NTPControl
-      NTPSERVER = 'pool.ntp.org'
-      SLEEPWAIT = 5
-      TRIES = 5
-      def initialize(options, hosts)
-        @options = options.dup
-        @hosts = hosts
-        @logger = options[:logger]
-      end
-
-      def timesync
-        @logger.notify "Update system time sync"
-        @logger.notify "run ntpdate against NTP pool systems"
-        @hosts.each do |host|
-          if host['platform'].include? 'windows'
-            # The exit code of 5 is for Windows 2008 systems where the w32tm /register command
-            # is not actually necessary.
-            host.exec(Command.new("w32tm /register"), :acceptable_exit_codes => [0,5])
-            host.exec(Command.new("net start w32time"), :acceptable_exit_codes => [0,2])
-            host.exec(Command.new("w32tm /config /manualpeerlist:#{NTPSERVER} /syncfromflags:manual /update"))
-            host.exec(Command.new("w32tm /resync"))
-            @logger.notify "NTP date succeeded on #{host}"
-          else
-            case
-              when host['platform'] =~ /solaris-10/
-                ntp_command = "sleep 10 && ntpdate -w #{NTPSERVER}"
-              when host['platform'] =~ /sles-/
-                ntp_command = "sntp #{NTPSERVER}"
-              else
-                ntp_command = "ntpdate -t 20 #{NTPSERVER}"
-            end
-            success=false
-            try = 0
-            until try >= TRIES do
-              try += 1
-              if host.exec(Command.new(ntp_command), :acceptable_exit_codes => (0..255)).exit_code == 0
-                success=true
-                break
-              end
-              sleep SLEEPWAIT
-            end
-            if success
-              @logger.notify "NTP date succeeded on #{host} after #{try} tries"
-            else
-              raise "NTP date was not successful after #{try} tries"
-            end
-          end
-        end
-      rescue => e
-        report_and_raise(@logger, e, "timesync (--ntp)")
-      end
-
-    end
-  end
-end

data/lib/beaker/utils/repo_control.rb

@@ -1,90 +0,0 @@
-module Beaker 
-  module Utils
-    class RepoControl
-
-      APT_CFG = %q{ Acquire::http::Proxy "http://proxy.puppetlabs.net:3128/"; }
-      IPS_PKG_REPO="http://solaris-11-internal-repo.delivery.puppetlabs.net"
-
-      def initialize(options, hosts)
-        @options = options.dup
-        @hosts = hosts
-        @logger = options[:logger]
-        @debug_opt = options[:debug] ? 'vh' : ''
-      end
-
-      def epel_info_for! host
-        version = host['platform'].match(/el-(\d+)/)[1]
-        if version == '6'
-          pkg = 'epel-release-6-8.noarch.rpm'
-          url = "http://mirror.itc.virginia.edu/fedora-epel/6/i386/#{pkg}"
-        elsif version == '5'
-          pkg = 'epel-release-5-4.noarch.rpm'
-          url = "http://archive.linux.duke.edu/pub/epel/5/i386/#{pkg}"
-        else
-          raise "I don't understand your platform description!"
-        end
-        return url
-      end
-
-      def apt_get_update host
-        if host[:platform] =~ /(ubuntu)|(debian)/ 
-          host.exec(Command.new("apt-get -y -f -m update"))
-        end
-      end
-
-      def copy_file_to_remote(host, file_path, file_content)
-        Tempfile.open 'beaker' do |tempfile|
-          File.open(tempfile.path, 'w') {|file| file.puts file_content }
-
-          host.do_scp_to(tempfile.path, file_path, @options)
-        end
-
-      end
-
-      def proxy_config
-        # repo_proxy
-        # supports ubuntu, debian and solaris platforms
-        @hosts.each do |host|
-          case
-          when host['platform'] =~ /ubuntu/
-            host.exec(Command.new("if test -f /etc/apt/apt.conf; then mv /etc/apt/apt.conf /etc/apt/apt.conf.bk; fi"))
-            copy_file_to_remote(host, '/etc/apt/apt.conf', APT_CFG)
-            apt_get_update(host)
-          when host['platform'] =~ /debian/
-            host.exec(Command.new("if test -f /etc/apt/apt.conf; then mv /etc/apt/apt.conf /etc/apt/apt.conf.bk; fi"))
-            copy_file_to_remote(host, '/etc/apt/apt.conf', APT_CFG)
-            apt_get_update(host)
-          when host['platform'] =~ /solaris-11/
-            host.exec(Command.new("/usr/bin/pkg unset-publisher solaris || :"))
-            host.exec(Command.new("/usr/bin/pkg set-publisher -g %s solaris" % IPS_PKG_REPO))
-          else
-            @logger.debug "#{host}: repo proxy configuration not modified"
-          end
-        end
-      rescue => e
-        report_and_raise(@logger, e, "proxy_config")
-      end
-
-      def add_el_extras
-        #add_el_extras
-        #only supports el-* platforms
-        @hosts.each do |host|
-          case
-          when host['platform'] =~ /el-(5|6)/
-            result = host.exec(Command.new('rpm -qa | grep epel-release'), :acceptable_exit_codes => [0,1])
-            if result.exit_code == 1
-              url = epel_info_for! host
-              host.exec(Command.new("rpm -i#{@debug_opt} #{url}"))
-              host.exec(Command.new('yum clean all && yum makecache'))
-            end
-          else
-            @logger.debug "#{host}: package repo configuration not modified"
-          end
-        end
-      rescue => e
-        report_and_raise(@logger, e, "add_repos")
-      end
-
-    end
-  end
-end