beaker 2.35.0 → 2.36.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzUxMTk0ODg1NjgxNDFkYzQ2ZDMzZTc5MjYxMDNkOTg1ODc1YmZlMg==
+    Y2FjZjE4ZjkyMmEyZTI3MWU2YmFmNTFlNzIwN2I0YzY3ZGFmODZkYg==
   data.tar.gz: !binary |-
-    M2Q4ZTQ3MjcyZmE3ZTA5YTdlMmYyYjdkMzFjZTAxMDMxMTRkMDUwNw==
+    YmZkM2M3MThkOTEzNDMzYTBlOWRmOWNjNTBkNThkMWE0ZGQ5NzNjMQ==
 SHA512:
   metadata.gz: !binary |-
-    NDljNGJlOWRkNTI2NDkyM2JiZGI0ODY2YWVjYWZmZWEyYjRjMGIyMDE2YTZm
-    OTMwYzJkOTQ4M2VmNmExYzQ5ZTI3YzkwMTkwMDMwZDIxOTFlYWI3Y2RmZDky
-    ZGEzNTcxMWUzODljODA1MTA0YTFkMDZhMzczZjE3MjE0ZjVjZDY=
+    M2M5MDkwOGNjYTBiYmU2YzcxMDFjM2YzNzMyN2U5ZGMzZDc5NjRlNTZkYzU2
+    M2NjNDE5ZjNjMWU3Yzc4YzAyM2ZjN2RmMDE3YWZmZGI1OWM2NDMxNzg2ZTY5
+    OTE4MDYzZDcxZWVmMzY2NDY4NzM4OWNiYWNmZjA5OTJmMjk4NzE=
   data.tar.gz: !binary |-
-    YjE1MDQxMWYyYmMzMWM2NjdlZjFmYzQ5ZmU4YWE5YWEyNDQ4MzRkZGYzZTcw
-    NDAxM2YxZTdjYTZjYmIwYjBkMmI5NWE0OGM3N2IwYzljZDgwMzJlZTc3NGIx
-    YzJjNzI1ZDJhMDVlY2FmZGRiNDcwNTRmNGE3ZDgwNGUzMDc2MWU=
+    NzYyYjdjODA1ZTQwZjBiNmViYWEwY2YwOGI2MDJlY2IxN2FkMWVjODYwMmY0
+    YTRhMGVhYTNhYmZjYjZlZGJiYTZjZGJiZGNhM2NkNmZhNTIxZGU0MWFlYmI0
+    YzRkZDcyMGI0MWUyOTI3N2JjYjljM2U0ZTg2OWJlZmQ3ODIxOWI=

data/Gemfile

@@ -1,22 +1,3 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
-def location_for(place, fake_version = nil)
-  if place =~ /^(git:[^#]*)#(.*)/
-    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
-  elsif place =~ /^file:\/\/(.*)/
-    ['>= 0', { :path => File.expand_path($1), :require => false }]
-  else
-    [place, { :require => false }]
-  end
-end
-
-scooter_version = ENV['SCOOTER_VERSION']
-if ENV['GEM_SOURCE'] =~ /rubygems\.delivery\.puppetlabs\.net/
-  if scooter_version
-    gem 'scooter', *location_for(scooter_version)
-  else
-    gem 'scooter', '~> 2.0'
-  end
-end
-
 gemspec

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 24 Feb, 2016 (e714b1eb)](#LATEST)
+* [LATEST - 9 Mar, 2016 (571ab630)](#LATEST)
+* [2.35.0 - 24 Feb, 2016 (b20fa892)](#2.35.0)
 * [2.34.0 - 10 Feb, 2016 (b897a98a)](#2.34.0)
 * [2.33.0 - 27 Jan, 2016 (0dd8505a)](#2.33.0)
 * [2.32.1 - 14 Jan, 2016 (8c394fdb)](#2.32.1)
@@ -110,7 +111,93 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 24 Feb, 2016 (e714b1eb)
+### <a name = "LATEST">LATEST - 9 Mar, 2016 (571ab630)
+
+* (GEM) update beaker version to 2.36.0 (571ab630)
+
+* Merge pull request #1073 from kevpl/bkr308_beaker_pe_create (8b6be6f9)
+
+
+```
+Merge pull request #1073 from kevpl/bkr308_beaker_pe_create
+
+(BKR-308) moved PE-specific functionality to beaker-pe
+```
+* Merge pull request #1074 from objectverbobject/BKR-451 (c9102673)
+
+
+```
+Merge pull request #1074 from objectverbobject/BKR-451
+
+(BKR-451) Fix broken logger warnings
+```
+* Merge pull request #1072 from kevpl/bkr669_cisco7_install (0dc2537d)
+
+
+```
+Merge pull request #1072 from kevpl/bkr669_cisco7_install
+
+(BKR-669) added cisco-7 install release repo support
+```
+* Merge pull request #1075 from petems/maint-fix_error_in_beaker_docker (033e6f80)
+
+
+```
+Merge pull request #1075 from petems/maint-fix_error_in_beaker_docker
+
+(maint) Improves error message for Docker failure
+```
+* (maint) Improves error message for Docker failure (1a50d4ec)
+
+
+```
+(maint) Improves error message for Docker failure
+
+* Frontload the DOCKER_HOST variable, as it's the easiest thing to check
+* boot2docker-cli is deprecated (https://github.com/boot2docker/boot2docker-cli#deprecated)
+* Error could also occur on Windows
+```
+* (BKR-451) Fix broken logger warnings (f998bbae)
+
+
+```
+(BKR-451) Fix broken logger warnings
+
+The `warning` methods in `deploy_package_repo` should have been simply
+`warn`. This PR changes them to warn and adds appropriate spec testing
+for the methods to ensure they `warn` correctly.
+```
+* (BKR-308) added beaker-library DSL registry method (a6c72e80)
+
+* (BKR-308) added beaker-pe dependency (68f62624)
+
+* (BKR-308) removed scooter dependency (62579f89)
+
+* (BKR-308) removed PE-specific functionality (449a08e3)
+
+
+```
+(BKR-308) removed PE-specific functionality
+
+moved into beaker-pe library
+```
+* (BKR-669) added cisco-7 install release repo support (8aeebb0d)
+
+* Merge pull request #1070 from pinkypie/BKR-671 (fd26aa9d)
+
+
+```
+Merge pull request #1070 from pinkypie/BKR-671
+
+(BKR-671) - Add error handing for Beaker failing to acquire a VM from vmpooler
+```
+* (BKR-671) - Add spec test for change to provision method. (9688cd21)
+
+* (BKR-671) - Add error handing for Beaker failing to acquire a VM from vmpooler. (40d2db32)
+
+### <a name = "2.35.0">2.35.0 - 24 Feb, 2016 (b20fa892)
+
+* (HISTORY) update beaker history for gem release 2.35.0 (b20fa892)
 
 * (GEM) update beaker version to 2.35.0 (e714b1eb)
 

data/beaker.gemspec

@@ -44,6 +44,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'beaker-answers', '~> 0.0'
   s.add_runtime_dependency 'stringify-hash', '~> 0.0'
   s.add_runtime_dependency 'beaker-hiera', '~> 0.0'
+  s.add_runtime_dependency 'beaker-pe', '~> 0.0'
 
   # Optional provisioner specific support
   s.add_runtime_dependency 'rbvmomi', '~> 1.8'

data/lib/beaker/dsl.rb

@@ -3,6 +3,7 @@
   require "beaker/dsl/#{lib}"
 end
 
+require 'beaker-pe'
 module Beaker
   # This is a catch all module for including Puppetlabs home grown testing
   # DSL. This module is mixed into {Beaker::TestCase} and can be
@@ -79,5 +80,10 @@ module Beaker
     include Beaker::DSL::Helpers
     include Beaker::DSL::InstallUtils
     include Beaker::DSL::Patterns
+    include Beaker::DSL::PE
+
+    def self.register(helper_module)
+      include helper_module
+    end
   end
 end

data/lib/beaker/dsl/install_utils.rb

@@ -1,13 +1,14 @@
-[ 'foss', 'pe', 'puppet', 'ezbake', 'module' ].each do |lib|
+[ 'foss', 'puppet', 'ezbake', 'module' ].each do |lib|
     require "beaker/dsl/install_utils/#{lib}_utils"
 end
+require "beaker/dsl/install_utils/pe_defaults"
 
 module Beaker
   module DSL
     # Collection of installation methods and support
     module InstallUtils
       include DSL::InstallUtils::PuppetUtils
-      include DSL::InstallUtils::PEUtils
+      include DSL::InstallUtils::PEDefaults
       include DSL::InstallUtils::FOSSUtils
       include DSL::InstallUtils::ModuleUtils
       include DSL::InstallUtils::EZBakeUtils

data/lib/beaker/dsl/install_utils/foss_utils.rb

@@ -849,8 +849,14 @@ module Beaker
                 [opts[:release_yum_repo_url], repo_name, variant_url_value, version]
 
               if variant == 'cisco'
-                # cisco requires using yum to install the repo
-                host.install_package( remote )
+                if version == '5'
+                  # cisco requires using yum to install the repo
+                  host.install_package( remote )
+                end
+                if version == '7'
+                  # cisco 7 requires using yum to localinstall the repo
+                  on host, "yum -y localinstall #{remote}"
+                end
               else
                 host.install_package_with_rpm( remote, '--replacepkgs',
                   { :package_proxy => opts[:package_proxy] } )

data/lib/beaker/host/unix/pkg.rb

@@ -209,7 +209,7 @@ module Unix::Pkg
     codename = self['platform'].codename
 
     if codename.nil?
-      @logger.warning "Could not determine codename for debian platform #{self['platform']}. Skipping deployment of repo #{name}"
+      @logger.warn "Could not determine codename for debian platform #{self['platform']}. Skipping deployment of repo #{name}"
       return
     end
 
@@ -248,7 +248,7 @@ module Unix::Pkg
   #       params
   def deploy_package_repo(path, name, version)
     if not File.exists? path
-      @logger.warning "Was asked to deploy package repository from #{path}, but it doesn't exist!"
+      @logger.warn "Was asked to deploy package repository from #{path}, but it doesn't exist!"
       return
     end
 

data/lib/beaker/hypervisor/docker.rb

@@ -23,7 +23,7 @@ module Beaker
       begin
         ::Docker.validate_version!
       rescue Excon::Errors::SocketError => e
-        raise "Docker instance not connectable.\nError was: #{e}\nIf you are on OSX, you might not have Boot2Docker setup correctly\nCheck your DOCKER_HOST variable has been set"
+        raise "Docker instance not connectable.\nError was: #{e}\nCheck your DOCKER_HOST variable has been set\nIf you are on OSX or Windows, you might not have Docker Machine setup correctly: https://docs.docker.com/machine/\n"
       end
 
       # Pass on all the logging from docker-api to the beaker logger instance

data/lib/beaker/hypervisor/vmpooler.rb

@@ -87,6 +87,14 @@ module Beaker
           })
     end
 
+    # Get host info hash from parsed json response
+    # @param [Hash] parsed_response hash
+    # @param [String] template string
+    # @return [Hash] Host info hash
+    def get_host_info(parsed_response, template)
+      parsed_response[template]
+    end
+
     def provision
       request_payload = {}
       start = Time.now
@@ -127,6 +135,10 @@ module Beaker
           domain = parsed_response['domain']
 
           @hosts.each_with_index do |h, i|
+            # If the requested host template is not available on vmpooler
+            if get_host_info(parsed_response, h['template']).nil?
+              raise "Vmpooler.provision - requested host #{h['template']} not available"
+            end
             if parsed_response[h['template']]['hostname'].is_a?(Array)
               hostname = parsed_response[h['template']]['hostname'].shift
             else

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.35.0'
+    STRING = '2.36.0'
   end
 end

data/spec/beaker/dsl/install_utils/foss_utils_spec.rb

@@ -630,6 +630,37 @@ describe ClassMixedWithDSLInstallUtils do
 
   end
 
+  describe '#install_puppetlabs_release_repo_on' do
+    let( :host ) do
+      FakeHost.create( 'fakevm', platform.to_s )
+    end
+
+    before :each do
+      allow( subject ).to receive( :options ) { opts }
+    end
+
+    context 'on cisco platforms' do
+      context 'version 5' do
+        let( :platform ) { Beaker::Platform.new( 'cisco-5-x86_64' ) }
+
+        it 'calls host.install_package' do
+          expect( host ).to receive( :install_package ).with( /\.rpm$/ )
+          subject.install_puppetlabs_release_repo_on( host )
+        end
+      end
+
+      context 'version 7' do
+        let( :platform ) { Beaker::Platform.new( 'cisco-7-x86_64' ) }
+
+        it 'uses yum localinstall to install the package' do
+          expect( subject ).to receive( :on ).with( host, /^yum.*localinstall.*\.rpm$/ )
+          subject.install_puppetlabs_release_repo_on( host )
+        end
+      end
+    end
+
+  end
+
   describe "#install_puppetlabs_dev_repo" do
     let( :package_name ) { "puppet" }
     let( :package_version ) { "7.5.6" }

data/spec/beaker/host/unix/pkg_spec.rb

@@ -28,8 +28,61 @@ module Beaker
     let (:logger)   { double( 'logger' ).as_null_object }
     let (:instance) { UnixPkgTest.new(opts, logger) }
 
-    context "check_for_package" do
+    context 'Package deployment tests' do
+      path = '/some/file/path'
+      name = 'package_name'
+      version = '1.0.0'
+
+      describe '#deploy_package_repo' do
+
+        it 'returns a warning if there is no file at the path specified' do
+          expect(logger).to receive(:warn)
+          allow(File).to receive(:exists?).with(path).and_return(false)
+          instance.deploy_package_repo(path,name,version)
+        end
+
+        it 'calls #deploy_apt_repo for debian systems' do
+          @opts = {'platform' => 'ubuntu-is-me'}
+          expect(instance).to receive(:deploy_apt_repo)
+          allow(File).to receive(:exists?).with(path).and_return(true)
+          instance.deploy_package_repo(path,name,version)
+        end
+
+        it 'calls #deploy_yum_repo for el systems' do
+          @opts = {'platform' => 'el-is-me'}
+          expect(instance).to receive(:deploy_yum_repo)
+          allow(File).to receive(:exists?).with(path).and_return(true)
+          instance.deploy_package_repo(path,name,version)
+        end
+
+        it 'calls #deploy_zyp_repo for sles systems' do
+          @opts = {'platform' => 'sles-is-me'}
+          expect(instance).to receive(:deploy_zyp_repo)
+          allow(File).to receive(:exists?).with(path).and_return(true)
+          instance.deploy_package_repo(path,name,version)
+        end
 
+        it 'raises an error for unsupported systems' do
+          @opts = {'platform' => 'windows-is-me'}
+          allow(File).to receive(:exists?).with(path).and_return(true)
+          expect{instance.deploy_package_repo(path,name,version)}.to raise_error(RuntimeError)
+        end
+      end
+
+      describe '#deploy_apt_repo' do
+
+        it 'warns and exits when no codename exists for the debian platform' do
+          @opts = {'platform' => 'ubuntu-is-me'}
+          expect(logger).to receive(:warn)
+          allow(@opts['platform']).to receive(:codename).and_return(nil)
+          expect(instance).to receive(:deploy_apt_repo).and_return(instance.deploy_apt_repo(path,name,version))
+          allow(File).to receive(:exists?).with(path).and_return(true)
+          instance.deploy_package_repo(path,name,version)
+        end
+      end
+    end
+
+    context "check_for_package" do
       it "checks correctly on sles" do
         @opts = {'platform' => 'sles-is-me'}
         pkg = 'sles_package'

data/spec/beaker/hypervisor/docker_spec.rb

@@ -93,6 +93,8 @@ module Beaker
       end
       it 'should fail when docker not present' do
         expect { docker }.to raise_error(RuntimeError, /Docker instance not connectable./)
+        expect { docker }.to raise_error(RuntimeError, /Check your DOCKER_HOST variable has been set/)
+        expect { docker }.to raise_error(RuntimeError, /If you are on OSX or Windows, you might not have Docker Machine setup correctly/)
         expect { docker }.to raise_error(RuntimeError, /Error was: oops/)
       end
     end

data/spec/beaker/hypervisor/vmpooler_spec.rb

@@ -73,6 +73,17 @@ module Beaker
           expect( host['vmhostname'] ).to be === 'pool'
         end
       end
+
+      it 'raises an error when a host template is not found in returned json' do
+        vmpooler = Beaker::Vmpooler.new( make_hosts, make_opts )
+        host          = vmpooler.instance_variable_get(:@hosts)[0][:template]
+
+        allow( vmpooler ).to receive( :require ).and_return( true )
+        allow( vmpooler ).to receive( :sleep ).and_return( true )
+        allow( vmpooler ).to receive(:get_host_info).and_return(nil)
+
+        expect {vmpooler.provision}.to raise_error RuntimeError,"Vmpooler.provision - requested host #{host} not available"
+      end
     end
 
     describe "#cleanup" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.35.0
+  version: 2.36.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -290,6 +290,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: beaker-pe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
@@ -590,7 +604,6 @@ files:
 - lib/beaker/dsl/install_utils/foss_utils.rb
 - lib/beaker/dsl/install_utils/module_utils.rb
 - lib/beaker/dsl/install_utils/pe_defaults.rb
-- lib/beaker/dsl/install_utils/pe_utils.rb
 - lib/beaker/dsl/install_utils/puppet_utils.rb
 - lib/beaker/dsl/install_utils/windows_utils.rb
 - lib/beaker/dsl/outcomes.rb
@@ -664,7 +677,6 @@ files:
 - lib/beaker/options/options_file_parser.rb
 - lib/beaker/options/options_hash.rb
 - lib/beaker/options/parser.rb
-- lib/beaker/options/pe_version_scraper.rb
 - lib/beaker/options/presets.rb
 - lib/beaker/options/validator.rb
 - lib/beaker/perf.rb
@@ -695,7 +707,6 @@ files:
 - spec/beaker/dsl/install_utils/foss_utils_spec.rb
 - spec/beaker/dsl/install_utils/module_utils_spec.rb
 - spec/beaker/dsl/install_utils/pe_defaults_spec.rb
-- spec/beaker/dsl/install_utils/pe_utils_spec.rb
 - spec/beaker/dsl/install_utils/puppet_utils_spec.rb
 - spec/beaker/dsl/install_utils/windows_utils_spec.rb
 - spec/beaker/dsl/outcomes_spec.rb
@@ -753,7 +764,6 @@ files:
 - spec/beaker/options/options_file_parser_spec.rb
 - spec/beaker/options/options_hash_spec.rb
 - spec/beaker/options/parser_spec.rb
-- spec/beaker/options/pe_version_scaper_spec.rb
 - spec/beaker/options/presets_spec.rb
 - spec/beaker/options/validator_spec.rb
 - spec/beaker/perf_spec.rb