beaker 1.9.1 → 1.10.0

data/lib/beaker/hypervisor/blimper.rb

@@ -1,29 +1,10 @@
 require 'blimpy'
 require 'yaml' unless defined?(YAML)
+require 'beaker/hypervisor/ec2_helper'
 
-module Beaker 
+module Beaker
   class Blimper < Beaker::Hypervisor
 
-    def amiports(host)
-      roles = host['roles']
-      ports = [22]
-
-      if roles.include? 'database'
-        ports << 8080
-        ports << 8081
-      end
-
-      if roles.include? 'master'
-        ports << 8140
-      end
-
-      if roles.include? 'dashboard'
-        ports << 443
-      end
-
-      ports
-    end
-
     def initialize(blimpy_hosts, options)
       @options = options
       @logger = options[:logger]
@@ -46,7 +27,7 @@ module Beaker
           ami = ami_spec[amitype]
           fleet.add(:aws) do |ship|
             ship.name = host.name
-            ship.ports = amiports(host)
+            ship.ports = Beaker::EC2Helper.amiports(host['roles'])
             ship.image_id = ami[:image][image_type.to_sym]
             if not ship.image_id
               raise "No image_id found for host #{ship.name} (#{amitype}:#{amisize}) using snapshot/image_type #{image_type}"
@@ -54,7 +35,11 @@ module Beaker
             ship.flavor = amisize
             ship.region = ami[:region]
             ship.username = 'root'
-            ship.tags = {:department => @options[:department], :project => @options[:project]}
+            ship.tags = {
+              :department => @options[:department],
+              :project => @options[:project],
+              :jenkins_build_url => @options[:jenkins_build_url],
+            }
           end
           @logger.debug "Added #{host.name} (#{amitype}:#{amisize}) using snapshot/image_type #{image_type} to blimpy fleet"
         end

data/lib/beaker/hypervisor/ec2_helper.rb

@@ -0,0 +1,28 @@
+module Beaker
+  class EC2Helper
+    # Return a list of open ports for testing based on a hosts role
+    #
+    # @todo horribly hard-coded
+    # @param [Array<String>] an array of roles
+    # @return [Array<Number>] array of port numbers
+    # @api private
+    def self.amiports(roles)
+      ports = [22]
+
+      if roles.include? 'database'
+        ports << 8080
+        ports << 8081
+      end
+
+      if roles.include? 'master'
+        ports << 8140
+      end
+
+      if roles.include? 'dashboard'
+        ports << 443
+      end
+
+      ports
+    end
+  end
+end

data/lib/beaker/hypervisor/google_compute.rb

@@ -45,7 +45,8 @@ module Beaker
 
 
       @hosts.each do |host|
-        img = @gce_helper.get_latest_image(host[:platform], start, attempts)
+        gplatform = Platform.new(host[:image] || host[:platform])
+        img = @gce_helper.get_latest_image(gplatform, start, attempts)
         host['diskname'] = generate_host_name
         disk = @gce_helper.create_disk(host['diskname'], img, start, attempts)
         @logger.debug("Created Google Compute disk for #{host.name}: #{host['diskname']}")
@@ -57,8 +58,9 @@ module Beaker
         @logger.debug("Created Google Compute instance for #{host.name}: #{host['vmhostname']}")
         #add metadata to instance
         @gce_helper.setMetadata_on_instance(host['vmhostname'], instance['metadata']['fingerprint'],
-                                            [ {:key => :department, :value => @options[:department]}, 
-                                              {:key => :project, :value => @options[:project]} ], 
+                                            [ {:key => :department, :value => @options[:department]},
+                                              {:key => :project, :value => @options[:project]},
+                                              {:key => :jenkins_build_url, :value => @options[:jenkins_build_url]} ],
                                             start, attempts)
         @logger.debug("Added tags to Google Compute instance #{host.name}: #{host['vmhostname']}")
 
@@ -87,7 +89,7 @@ module Beaker
       attempts = @options[:timeout].to_i / SLEEPWAIT
       start = Time.now
 
-      @gce_helper.delete_firewall(@firewall, start, attempts) 
+      @gce_helper.delete_firewall(@firewall, start, attempts)
 
       @hosts.each do |host|
         @gce_helper.delete_instance(host['vmhostname'], start, attempts)
@@ -97,14 +99,14 @@ module Beaker
       end
 
     end
- 
-    #Shutdown and destroy Google Compute instances (including their associated disks and firewall rules) 
+
+    #Shutdown and destroy Google Compute instances (including their associated disks and firewall rules)
     #that have been alive longer than ZOMBIE hours.
     def kill_zombies(max_age = ZOMBIE)
       now = start = Time.now
       attempts = @options[:timeout].to_i / SLEEPWAIT
 
-      #get rid of old instances 
+      #get rid of old instances
       instances = @gce_helper.list_instances(start, attempts)
       if instances
         instances.each do |instance|
@@ -116,7 +118,7 @@ module Beaker
             @gce_helper.delete_instance( instance['name'], start, attempts )
           end
         end
-      else 
+      else
         @logger.debug("No zombie instances found")
       end
       #get rid of old disks

data/lib/beaker/hypervisor/google_compute_helper.rb

@@ -477,7 +477,7 @@ module Beaker
       { :api_method  => @compute.firewalls.insert,
         :parameters  => { 'project' => @options[:gce_project], 'zone' => DEFAULT_ZONE_NAME },
         :body_object => { 'name' => name,
-                          'allowed'=> [ { 'IPProtocol' => 'tcp', "ports" =>  [ '443', '8140', '61613' ]} ],
+                          'allowed'=> [ { 'IPProtocol' => 'tcp', "ports" =>  [ '443', '8140', '61613', '8080', '8081' ]} ],
                           'network'=> network,
                           'sourceRanges' => [ "0.0.0.0/0" ] } }
     end

data/lib/beaker/hypervisor/vagrant.rb

@@ -30,6 +30,11 @@ module Beaker
         v_file << "    v.vm.box_url = '#{host['box_url']}'\n" unless host['box_url'].nil?
         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"
+        if /windows/i.match(host['platform'])
+          v_file << "    v.vm.network :forwarded_port, guest: 3389, host: 3389\n"
+          v_file << "    v.vm.network :forwarded_port, guest: 5985, host: 5985, id: 'winrm', auto_correct: true\n"
+          v_file << "    v.vm.guest = :windows"
+        end
         v_file << "  end\n"
         @logger.debug "created Vagrantfile for VagrantHost #{host.name}"
       end
@@ -92,6 +97,9 @@ module Beaker
     end
 
     def provision
+      if !@options[:provision] and !File.file?(@vagrant_file)
+        raise "Beaker is configured with provision = false but no vagrant file was found at #{@vagrant_file}. You need to enable provision"
+      end
       if @options[:provision]
         #setting up new vagrant hosts
         #make sure that any old boxes are dead dead dead

data/lib/beaker/options/command_line_parser.rb

@@ -170,6 +170,12 @@ module Beaker
             @cmd_options[:add_el_extras] = true
           end
 
+          opts.on '--[no-]validate',
+                  'Validate that SUTs are correctly configured before running tests',
+                  '(default: true)' do |bool|
+            @cmd_options[:validate] = bool
+          end
+
           opts.on('--version', 'Report currently running version of beaker' ) do 
             @cmd_options[:version] = true
           end

data/lib/beaker/options/parser.rb

@@ -78,7 +78,7 @@ module Beaker
               if discover_files.empty?
                 parser_error "empty directory used as an option (#{root})!"
               end
-              files += discover_files.sort
+              files += discover_files.sort_by {|file| [file.count("/"), file]}
             else #not a file, not a directory, not nothin'
               parser_error "#{root} used as a file option but is not a file or directory!"
             end

data/lib/beaker/options/presets.rb

@@ -23,6 +23,7 @@ module Beaker
           :pe_ver => ENV['pe_ver'],
           :project => ENV['BEAKER_project'],
           :department => ENV['BEAKER_department'],
+          :jenkins_build_url => ENV['BUILD_URL'],
         }.delete_if {|key, value| value.nil? or value.empty? })
       end
 
@@ -34,6 +35,8 @@ module Beaker
         h.merge({
           :project => 'Beaker',
           :department => ENV['USER'] || ENV['USERNAME'] || 'unknown',
+          :validate => true,
+          :jenkins_build_url => nil,
           :log_level => 'verbose',
           :trace_limit => 10,
           :hosts_file => 'sample.cfg',

data/lib/beaker/ssh_connection.rb

@@ -14,7 +14,8 @@ module Beaker
       Errno::ECONNREFUSED,
       Errno::ECONNRESET,
       Errno::ENETUNREACH,
-      Net::SSH::Disconnect
+      Net::SSH::Disconnect,
+      Net::SSH::AuthenticationFailed,
     ]
 
     def initialize hostname, user = nil, options = {}
@@ -48,8 +49,6 @@ module Beaker
                    puts "Failed to connect to #{@hostname}"
                    raise
                  end
-               rescue Net::SSH::AuthenticationFailed => e
-                 raise "Unable to authenticate to #{@hostname} with user #{e.message.inspect}"
                end
       self
     end

data/lib/beaker/test_case.rb

@@ -131,13 +131,13 @@ module Beaker
               @test_status = :pending
             rescue SkipTest
               @test_status = :skip
-            rescue StandardError, ScriptError => e
+            rescue StandardError, ScriptError, SignalException => e
               log_and_fail_test(e)
             ensure
               @teardown_procs.each do |teardown|
                 begin
                   teardown.call
-                rescue StandardError => e
+                rescue StandardError, SignalException => e
                   log_and_fail_test(e)
                 end
               end

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '1.9.1'
+    STRING = '1.10.0'
   end
 end

data/spec/beaker/dsl/helpers_spec.rb

@@ -447,6 +447,26 @@ describe ClassMixedWithDSLHelpers do
         :expect_failures       => true
       )
     end
+
+    it 'can set the --parser future flag' do
+      subject.should_receive( :create_remote_file ).and_return( true )
+      subject.should_receive( :puppet ).
+        with( 'apply', '--verbose', '--parser future', '--detailed-exitcodes', 'agent' ).
+        and_return( 'puppet_command' )
+      subject.should_receive( :on ).with(
+        agent,
+        'puppet_command',
+        :acceptable_exit_codes => [1,2,3,4,5,6]
+      )
+
+      subject.apply_manifest_on(
+        agent,
+        'class { "boo": }',
+        :acceptable_exit_codes => (1..5),
+        :future_parser         => true,
+        :expect_failures       => true
+      )
+    end
   end
 
   describe "#apply_manifest" do
@@ -654,11 +674,13 @@ describe ClassMixedWithDSLHelpers do
     let(:test_case_path) { 'testcase/path' }
     let(:tmpdir_path) { '/tmp/tmpdir' }
     let(:puppet_path) { '/puppet/path' }
+    let(:puppetservice) { @ps || nil }
     let(:is_pe) { false }
     let(:host) do
       FakeHost.new(:pe => is_pe,
                    :options => {
         'puppetpath' => puppet_path,
+        'puppetservice' => puppetservice,
         'platform' => 'el'
       })
     end
@@ -689,23 +711,23 @@ describe ClassMixedWithDSLHelpers do
         Tempfile.should_receive(:open).with('beaker')
       end
 
-      context 'as pe' do
-        let(:is_pe) { true }
+      context 'with puppetservice and service-path defined' do
+        let(:puppetservice) { 'whatever' }
 
         it 'bounces puppet twice' do
           subject.with_puppet_running_on(host, {})
-          expect(host).to execute_commands_matching(/pe-httpd restart/).exactly(2).times
+          expect(host).to execute_commands_matching(/#{@ps} restart/).exactly(2).times
         end
 
         it 'yield to a block after bouncing service' do
           execution = 0
           expect do
             subject.with_puppet_running_on(host, {}) do
-              expect(host).to execute_commands_matching(/pe-httpd restart/).once
+              expect(host).to execute_commands_matching(/#{@ps} restart/).once
               execution += 1
             end
           end.to change { execution }.by(1)
-          expect(host).to execute_commands_matching(/pe-httpd restart/).exactly(2).times
+          expect(host).to execute_commands_matching(/#{@ps} restart/).exactly(2).times
         end
       end
 

data/spec/beaker/dsl/install_utils_spec.rb

@@ -299,7 +299,7 @@ describe ClassMixedWithDSLInstallUtils do
       it 'installs' do
         expect(subject).to receive(:on).with(hosts[0], /puppetlabs-release-\$\(lsb_release -c -s\)\.deb/)
         expect(subject).to receive(:on).with(hosts[0], 'dpkg -i puppetlabs-release-$(lsb_release -c -s).deb')
-        expect(subject).to receive(:on).with(hosts[0], 'apt-get -y -f -m update')
+        expect(subject).to receive(:on).with(hosts[0], 'apt-get update')
         expect(subject).to receive(:on).with(hosts[0], 'apt-get install -y puppet')
         subject.install_puppet
       end
@@ -309,7 +309,7 @@ describe ClassMixedWithDSLInstallUtils do
       it 'installs' do
         expect(subject).to receive(:on).with(hosts[0], /puppetlabs-release-\$\(lsb_release -c -s\)\.deb/)
         expect(subject).to receive(:on).with(hosts[0], 'dpkg -i puppetlabs-release-$(lsb_release -c -s).deb')
-        expect(subject).to receive(:on).with(hosts[0], 'apt-get -y -f -m update')
+        expect(subject).to receive(:on).with(hosts[0], 'apt-get update')
         expect(subject).to receive(:on).with(hosts[0], 'apt-get install -y puppet')
         subject.install_puppet
       end

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -111,7 +111,7 @@ describe Beaker do
     it "can perform apt-get on ubuntu hosts" do
       host = make_host( 'testhost', { :platform => 'ubuntu' } )
 
-      Beaker::Command.should_receive( :new ).with("apt-get -y -f -m update").once
+      Beaker::Command.should_receive( :new ).with("apt-get update").once
 
       subject.apt_get_update( host )
 
@@ -120,7 +120,7 @@ describe Beaker do
     it "can perform apt-get on debian hosts" do
       host = make_host( 'testhost', { :platform => 'debian' } )
 
-      Beaker::Command.should_receive( :new ).with("apt-get -y -f -m update").once
+      Beaker::Command.should_receive( :new ).with("apt-get update").once
 
       subject.apt_get_update( host )
 

data/spec/beaker/hypervisor/aws_sdk_spec.rb

@@ -0,0 +1,81 @@
+require 'spec_helper'
+
+module Beaker
+  describe AwsSdk do
+    let(:aws) {
+      # Mock out the call to load_fog_credentials
+      Beaker::AwsSdk.any_instance.stub(:load_fog_credentials).and_return(fog_file_contents)
+
+      # This is needed because the EC2 api looks up a local endpoints.json file
+      FakeFS.deactivate!
+      aws = Beaker::AwsSdk.new(@hosts, make_opts)
+      FakeFS.activate!
+
+      aws
+    }
+    let(:amispec) {{
+      "centos-5-x86-64-west" => {
+        :image => {:pe => "ami-sekrit1"},
+        :region => "us-west-2",
+      },
+      "centos-6-x86-64-west" => {
+        :image => {:pe => "ami-sekrit2"},
+        :region => "us-west-2",
+      },
+      "centos-7-x86-64-west" => {
+        :image => {:pe => "ami-sekrit3"},
+        :region => "us-west-2",
+      },
+    }}
+
+    before :each do
+      @hosts = make_hosts({:snapshot => :pe})
+      @hosts[0][:platform] = "centos-5-x86-64-west"
+      @hosts[1][:platform] = "centos-6-x86-64-west"
+      @hosts[2][:platform] = "centos-7-x86-64-west"
+    end
+
+    context '#backoff_sleep' do
+      it "should call sleep 1024 times at attempt 10" do
+        Object.any_instance.should_receive(:sleep).with(1024)
+        aws.backoff_sleep(10)
+      end
+    end
+
+    context '#public_key' do
+      it "retrieves contents from local ~/.ssh/ssh_rsa.pub file" do
+        # Stub calls to file read/exists
+        allow(File).to receive(:exists?).with(/id_rsa.pub/) { true }
+        allow(File).to receive(:read).with(/id_rsa.pub/) { "foobar" }
+
+        # Should return contents of previously stubbed id_rsa.pub
+        expect(aws.public_key).to eq("foobar")
+      end
+
+      it "should return an error if the files do not exist" do
+        expect { aws.public_key }.to raise_error(RuntimeError, /Expected either/)
+      end
+    end
+
+    context '#key_name' do
+      it 'returns a key name from the local hostname' do
+        # Mock out the hostname and local user calls
+        Socket.should_receive(:gethostname) { "foobar" }
+        aws.should_receive(:local_user) { "bob" }
+
+        # Should match the expected composite key name
+        expect(aws.key_name).to eq("Beaker-bob-foobar")
+      end
+    end
+
+    context '#group_id' do
+      it 'should return a predicatable group_id from a port list' do
+        expect(aws.group_id([22, 1024])).to eq("Beaker-2799478787")
+      end
+
+      it 'should return a predicatable group_id from an empty list' do
+        expect { aws.group_id([]) }.to raise_error(ArgumentError, "Ports list cannot be nil or empty")
+      end
+    end
+  end
+end