beaker-pe 1.34.0 → 1.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dddeba9ddd4a3de4df7e891a16a387118dc418c4
-  data.tar.gz: 2526af158f14ee628af8e2264fc2573d004ca7fd
+  metadata.gz: 90ed458292d1bb6544717ab386c9a85410c79b1b
+  data.tar.gz: 95447c5d837868bd09b2c97e71c280cae245ca09
 SHA512:
-  metadata.gz: 6f0740c55b9cdd292e6ae4048edc86f6953227f6999511be6fbdad62c9c4fd9bb0e93a101c590e93f1bec55ef882ebb9eeb475871ad1ef48c72b636f451b3f9c
-  data.tar.gz: 50f1466cd21a57c43b16aaff85e76d3bb6878ae8359a363d4ea0dba8c45dc32a4f3420158f53928ec103804d9a11b9d9b6eb80b749297ee23e619cd9df3521ff
+  metadata.gz: 8fccbd15d0d9972742f4b38fdda770552a44e38cbff0f286b7559a595499ed883917fea55999d5676793608feced6e43418dba9519afcf173c6ce7b8ff487ecd
+  data.tar.gz: 1c7303c454a4bf2905d8be138b5679fd1443a63f3fd581caed7da670916a6fda610a319cc78d5aa7574493d7f38f8e308f8da1eebb1981a9f1eac0a382450d54

data/README.md

@@ -70,7 +70,7 @@ you'd like to provide your own hosts file, set the `CONFIG` environment variable
 # Release
 
 To release new versions, we use a
-[Jenkins job](https://jenkins-qe.delivery.puppetlabs.net/job/qe_beaker-pe_btc-rls/)
+[Jenkins job](https://cinext-jenkinsmaster-sre-prod-1.delivery.puppetlabs.net/job/qe_beaker-pe-gem_init-multijob_master/)
 (access to internal infrastructure will be required to view job).
 
 To release a new version (from the master branch), you'll need to just provide

data/lib/beaker-pe/install/pe_utils.rb

@@ -448,6 +448,39 @@ module Beaker
           end
         end
 
+        # Check for availability of required network resources
+        # @param [Array<Host>] hosts
+        # @param [Array<String>] network_resources
+        #
+        # @example
+        #   verify_network_resources(hosts, network_resources)
+        #
+        # @return nil
+        #
+        # @api private
+        def verify_network_resources(hosts, network_resources)
+          logger.notify("Checking the availability of network resources.")
+          hosts.each do |host|
+            # if options[:net_diag_hosts] isn't set, skip this check
+            if network_resources != nil
+              network_resources.each do |resource|
+                # curl the network resource silently (-s), only connect (-I), and don't print the output
+                on host, "curl -I -s #{resource} > /dev/null", :accept_all_exit_codes => true
+                if host.connection.logger.last_result.exit_code != 0
+                  logger.warn("Connection error: #{host.host_hash[:vmhostname]} was unable to connect to #{resource}. Please ensure that your test does not require this resource.")
+                end
+              end
+            end
+            hosts.each do |target_host|
+              ping_opts = host['platform'] =~ /windows/ ? "-n 1" : "-c1"
+              on host, "ping #{ping_opts} #{target_host.host_hash[:vmhostname]} > /dev/null", :accept_all_exit_codes => true
+              if host.connection.logger.last_result.exit_code != 0
+                logger.warn("Connection error: #{host.host_hash[:vmhostname]} was unable to connect to #{target_host.host_hash[:vmhostname]} in your testing infrastructure.")
+              end
+            end
+          end
+        end
+
         #Perform a Puppet Enterprise upgrade or install
         # @param [Array<Host>] hosts The hosts to install or upgrade PE on
         # @param  [Hash{Symbol=>Symbol, String}] opts The options
@@ -480,6 +513,7 @@ module Beaker
         def do_install hosts, opts = {}
           # detect the kind of install we're doing
           install_type = determine_install_type(hosts, opts)
+          verify_network_resources(hosts, options[:net_diag_hosts])
           if opts[:use_proxy]
             config_master_for_proxy_access
           end
@@ -564,7 +598,7 @@ module Beaker
           prepare_hosts(all_hosts, opts)
           fetch_pe([master], opts)
           prepare_host_installer_options(master)
-          generate_installer_conf_file_for(master, [master], opts)
+          generate_installer_conf_file_for(master, all_hosts, opts)
           step "Install PE on master" do
             on master, installer_cmd(master, opts)
           end

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '1.34.0'
+        STRING = '1.35.0'
       end
 
     end

data/spec/beaker-pe/install/pe_utils_spec.rb

@@ -10,7 +10,7 @@ class ClassMixedWithDSLInstallUtils
   include Beaker::DSL::Patterns
   include Beaker::DSL::PE
 
-  attr_accessor :hosts, :metadata, :options
+  attr_accessor :hosts, :metadata, :options, :logger
 
   def initialize
     @metadata = {}
@@ -22,10 +22,6 @@ class ClassMixedWithDSLInstallUtils
   def metadata
     @metadata ||= {}
   end
-
-  def logger
-    @logger ||= RSpec::Mocks::Double.new('logger').as_null_object
-  end
 end
 
 describe ClassMixedWithDSLInstallUtils do
@@ -71,6 +67,16 @@ describe ClassMixedWithDSLInstallUtils do
                         lei_hosts[3][:working_dir] = '/tmp'
                         lei_hosts }
 
+  let(:logger) do
+    logger = double('logger').as_null_object
+    allow(logger).to receive(:with_indent).and_yield
+    logger
+  end
+
+  before(:each) do
+    subject.logger = logger
+  end
+
   context '#prep_host_for_upgrade' do
 
     it 'sets per host options before global options' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 1.34.0
+  version: 1.35.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2018-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec