beaker 1.8.2 → 1.9.0

data/lib/beaker/hypervisor/vagrant.rb

@@ -42,16 +42,6 @@ module Beaker
       end
     end
 
-    def hack_etc_hosts hosts
-      etc_hosts = "127.0.0.1\tlocalhost localhost.localdomain\n"
-      hosts.each do |host|
-        etc_hosts += "#{host['ip'].to_s}\t#{host.name}\n"
-      end
-      hosts.each do |host|
-        set_etc_hosts(host, etc_hosts)
-      end
-    end
-
     def set_ssh_config host, user
         f = Tempfile.new("#{host.name}")
         ssh_config = Dir.chdir(@vagrant_path) do

data/lib/beaker/hypervisor/vcloud.rb

@@ -1,8 +1,7 @@
 require 'yaml' unless defined?(YAML)
 
-module Beaker 
+module Beaker
   class Vcloud < Beaker::Hypervisor
-    CHARMAP = [('a'..'z'),('0'..'9')].map{|r| r.to_a}.flatten
 
     def initialize(vcloud_hosts, options)
       @options = options
@@ -52,17 +51,15 @@ module Beaker
       end
     end
 
-    def generate_host_name
-      CHARMAP[rand(25)] + (0...14).map{CHARMAP[rand(CHARMAP.length)]}.join
-    end
-
     def create_clone_spec host
       # Add VM annotation
       configSpec = RbVmomi::VIM.VirtualMachineConfigSpec(
         :annotation =>
           'Base template:  ' + host['template'] + "\n" +
           'Creation time:  ' + Time.now.strftime("%Y-%m-%d %H:%M") + "\n\n" +
-          'CI build link:  ' + ( ENV['BUILD_URL'] || 'Deployed independently of CI' )
+          'CI build link:  ' + ( ENV['BUILD_URL'] || 'Deployed independently of CI' ) +
+          'department:     ' + @options[:department] +
+          'project:        ' + @options[:project]
       )
 
       # Are we using a customization spec?
@@ -95,44 +92,44 @@ module Beaker
       connect_to_vsphere
       begin
         vsphere_vms = {}
-  
+
         try = 1
         attempts = @options[:timeout].to_i / 5
-  
+
         start = Time.now
         tasks = []
         @hosts.each_with_index do |h, i|
           # Generate a randomized hostname
           h['vmhostname'] = generate_host_name
-  
+
           if h['template'] =~ /\//
             templatefolders = h['template'].split('/')
             h['template'] = templatefolders.pop
           end
-  
+
           @logger.notify "Deploying #{h['vmhostname']} (#{h.name}) to #{@options['folder']} from template '#{h['template']}'"
-  
+
           vm = {}
-  
+
           if templatefolders
             vm[h['template']] = @vsphere_helper.find_folder(templatefolders.join('/')).find(h['template'])
           else
             vm = @vsphere_helper.find_vms(h['template'])
           end
-  
+
           if vm.length == 0
             raise "Unable to find template '#{h['template']}'!"
           end
-  
+
           spec = create_clone_spec(h)
-  
+
           # Deploy from specified template
           tasks << vm[h['template']].CloneVM_Task( :folder => @vsphere_helper.find_folder(@options['folder']), :name => h['vmhostname'], :spec => spec )
         end
         try = (Time.now - start) / 5
         @vsphere_helper.wait_for_tasks(tasks, try, attempts)
         @logger.notify 'Spent %.2f seconds deploying VMs' % (Time.now - start)
-  
+
         try = (Time.now - start) / 5
         duration = run_and_report_duration do 
           @hosts.each_with_index do |h, i|
@@ -140,7 +137,7 @@ module Beaker
           end
         end
         @logger.notify "Spent %.2f seconds booting and waiting for vSphere registration" % duration
-  
+
         try = (Time.now - start) / 5
         duration = run_and_report_duration do
           @hosts.each_with_index do |h, i|
@@ -149,7 +146,7 @@ module Beaker
         end
         @logger.notify "Spent %.2f seconds waiting for DNS resolution" % duration
       rescue => e
-        @vsphere_helper.close 
+        @vsphere_helper.close
         report_and_raise(@logger, e, "Vcloud.provision")
       end
     end
@@ -163,7 +160,7 @@ module Beaker
         @logger.warn "Some hosts did not have vmhostname set correctly! This likely means VM provisioning was not successful"
       end
       vms = @vsphere_helper.find_vms vm_names
-      begin 
+      begin
         vm_names.each do |name|
           unless vm = vms[name]
             @logger.warn "Unable to cleanup #{name}, couldn't find VM #{name} in vSphere!"
@@ -178,7 +175,7 @@ module Beaker
             @logger.notify "Spent %.2f seconds halting #{vm.name}" % duration
           end
 
-          duration = run_and_report_duration do 
+          duration = run_and_report_duration do
             vm.Destroy_Task
           end
           @logger.notify "Spent %.2f seconds destroying #{vm.name}" % duration

data/lib/beaker/hypervisor/vcloud_pooled.rb

@@ -4,7 +4,6 @@ require 'net/http'
 
 module Beaker 
   class VcloudPooled < Beaker::Hypervisor
-    CHARMAP = [('a'..'z'),('0'..'9')].map{|r| r.to_a}.flatten
     SSH_EXCEPTIONS = [
       SocketError,
       Timeout::Error,

data/lib/beaker/options/parser.rb

@@ -5,7 +5,7 @@ module Beaker
     #An Object that parses, merges and normalizes all supported Beaker options and arguments
     class Parser
       GITREPO      = 'git://github.com/puppetlabs'
-      #These options can have the form of arg1,arg2 or [arg] or just arg,
+      #These options can have the form of arg1,arg2 or [arg] or just arg, 
       #should default to []
       LONG_OPTS    = [:helper, :load_path, :tests, :pre_suite, :post_suite, :install, :modules]
       #These options expand out into an array of .rb files

data/lib/beaker/options/presets.rb

@@ -20,7 +20,9 @@ module Beaker
           :pe_dir => ENV['pe_dist_dir'],
           :pe_version_file => ENV['pe_version_file'],
           :pe_version_file_win => ENV['pe_version_file'],
-          :pe_ver => ENV['pe_ver']
+          :pe_ver => ENV['pe_ver'],
+          :project => ENV['BEAKER_project'],
+          :department => ENV['BEAKER_department'],
         }.delete_if {|key, value| value.nil? or value.empty? })
       end
 
@@ -30,6 +32,8 @@ module Beaker
       def self.presets
         h = Beaker::Options::OptionsHash.new
         h.merge({
+          :project => 'Beaker',
+          :department => ENV['USER'] || ENV['USERNAME'] || 'unknown',
           :log_level => 'verbose',
           :trace_limit => 10,
           :hosts_file => 'sample.cfg',

data/lib/beaker/platform.rb

@@ -1,8 +1,10 @@
 module Beaker
+  #This class create a Platform object inheriting from String.  It supports all String methods while adding 
+  #several platform-specific use cases.
   class Platform < String
-    #supported platforms
+    #Supported platforms
     PLATFORMS = /^(centos|fedora|debian|oracle|redhat|scientific|sles|ubuntu|windows|solaris|aix|el)\-.+\-.+$/
-
+    #Platform version numbers vs. codenames conversion hash
     PLATFORM_VERSION_CODES = 
       { :debian => { "wheezy"  => "7",
                      "squeeze" => "6",
@@ -15,6 +17,20 @@ module Beaker
                    },
       }
 
+    #Creates the Platform object.  Checks to ensure that the platform String provided meets the platform
+    #formatting rules.  Platforms name must be of the format /^OSFAMILY-VERSION-ARCH.*$/ where OSFAMILY is one of:
+    # * centos
+    # * fedora
+    # * debian
+    # * oracle
+    # * redhat
+    # * scientific
+    # * sles
+    # * ubuntu
+    # * windows
+    # * solaris
+    # * aix
+    # * el
     def initialize(name)
       if name !~ PLATFORMS
         raise ArgumentError, "Unsupported platform name #{name}"
@@ -22,6 +38,10 @@ module Beaker
       super
     end
 
+    # Returns the platform string with the platform version as a codename.  If no conversion is
+    # necessary then the original, unchanged platform String is returned.
+    # @example Platform.new('debian-7-xxx').with_version_codename == 'debian-wheezy-xxx'
+    # @return [String] the platform string with the platform version represented as a codename
     def with_version_codename
       name, version, extra = self.split('-', 3)
       PLATFORM_VERSION_CODES.each_key do |platform|
@@ -39,6 +59,10 @@ module Beaker
       [name, version, extra].join('-')
     end
 
+    # Returns the platform string with the platform version as a number.  If no conversion is necessary
+    # then the original, unchanged platform String is returned.
+    # @example Platform.new('debian-wheezy-xxx').with_version_number == 'debian-7-xxx'
+    # @return [String] the platform string with the platform version represented as a number
     def with_version_number
       name, version, extra = self.split('-', 3)
       PLATFORM_VERSION_CODES.each_key do |platform|

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '1.8.2'
+    STRING = '1.9.0'
   end
 end

data/spec/beaker/dsl/install_utils_spec.rb

@@ -169,7 +169,7 @@ describe ClassMixedWithDSLInstallUtils do
       path = unixhost['pe_dir']
       filename = "#{ unixhost['dist'] }"
       extension = '.tar'
-      subject.should_receive( :on ).with( unixhost, "cd #{ unixhost['working_dir'] }; curl  #{ path }/#{ filename }#{ extension }  | tar -xvf -" ).once
+      subject.should_receive( :on ).with( unixhost, "cd #{ unixhost['working_dir'] }; curl #{ path }/#{ filename }#{ extension } | tar -xvf -" ).once
       subject.fetch_puppet( [unixhost], {} )
     end
 
@@ -182,7 +182,7 @@ describe ClassMixedWithDSLInstallUtils do
       path = unixhost['pe_dir']
       filename = "#{ unixhost['dist'] }"
       extension = '.tar.gz'
-      subject.should_receive( :on ).with( unixhost, "cd #{ unixhost['working_dir'] }; curl  #{ path }/#{ filename }#{ extension } | gunzip | tar -xvf -" ).once
+      subject.should_receive( :on ).with( unixhost, "cd #{ unixhost['working_dir'] }; curl #{ path }/#{ filename }#{ extension } | gunzip | tar -xvf -" ).once
       subject.fetch_puppet( [unixhost], {} )
     end
      

data/spec/beaker/hypervisor/fusion_spec.rb

@@ -21,6 +21,21 @@ module Beaker
       expect{ fusion.provision }.to raise_error
     end
 
+    it 'raises an error if snapshots is nil' do
+      MockFissionVM.set_snapshots(nil)
+      expect{ fusion.provision }.to raise_error(/No snapshots available/)
+    end
+
+    it 'raises an error if snapshots are empty' do
+      MockFissionVM.set_snapshots([])
+      expect{ fusion.provision }.to raise_error(/No snapshots available/)
+    end
+
+    it 'host fails init with nil snapshot' do
+      @hosts[0][:snapshot] = nil
+      expect{ Beaker::Fusion.new( @hosts, make_opts) }.to raise_error(/specify a snapshot/)
+    end
+
   end
 
 end

data/spec/beaker/hypervisor/vagrant_spec.rb

@@ -38,7 +38,7 @@ module Beaker
 
       generated_file = File.read( File.expand_path( File.join( path, "Vagrantfile") ) )
 
-      match = generated_file.match(/vb.customize \["modifyvm", :id, "--memory", "hello!"]/)
+      match = generated_file.match(/vb.customize \["modifyvm", :id, "--memory", "hello!"\]/)
 
       expect( match ).to_not be nil
 
@@ -50,7 +50,7 @@ module Beaker
         vagrant.should_receive( :set_etc_hosts ).with( host, "127.0.0.1\tlocalhost localhost.localdomain\nip.address.for.vm1\tvm1\nip.address.for.vm2\tvm2\nip.address.for.vm3\tvm3\n" ).once
       end
 
-      vagrant.hack_etc_hosts( @hosts )
+      vagrant.hack_etc_hosts( @hosts, options )
 
     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, :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=>[]}
+        expect(parser.parse_args(args)).to be === {:project=>"Beaker", :department=>"#{ENV['USER']}", :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/helpers.rb

@@ -53,7 +53,11 @@ module HostHelpers
                                                :pooling_api => 'http://vcloud.delivery.puppetlabs.net/',
                                                :datastore => 'instance0',
                                                :folder => 'Delivery/Quality Assurance/Staging/Dynamic',
-                                               :resourcepool => 'delivery/Quality Assurance/Staging/Dynamic' } )
+                                               :resourcepool => 'delivery/Quality Assurance/Staging/Dynamic',
+                                               :gce_project => 'beaker-compute',
+                                               :gce_keyfile => '/path/to/keyfile.p12',
+                                               :gce_password => 'notasecret',
+                                               :gce_email => '12345678910@developer.gserviceaccount.com' } )
   end
 
   def generate_result (name, opts )

data/spec/mock_blimpy.rb

@@ -1,5 +1,5 @@
 class MockShip 
-  attr_accessor :name, :ports, :image_id, :flavor, :region, :username, :dns
+  attr_accessor :name, :ports, :image_id, :flavor, :region, :username, :dns, :tags
 
   def initialize
     @dns = "my.ip.address"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.9.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -42,16 +42,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +206,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: google-api-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -306,6 +320,8 @@ files:
 - lib/beaker/hypervisor/aixer.rb
 - lib/beaker/hypervisor/blimper.rb
 - lib/beaker/hypervisor/fusion.rb
+- lib/beaker/hypervisor/google_compute.rb
+- lib/beaker/hypervisor/google_compute_helper.rb
 - lib/beaker/hypervisor/solaris.rb
 - lib/beaker/hypervisor/vagrant.rb
 - lib/beaker/hypervisor/vcloud.rb