beaker 2.27.0 → 2.28.0

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

@@ -133,8 +133,12 @@ module Beaker
               #move to the host
               logger.debug "Using scp to transfer #{source_path} to #{target_path}"
               scp_to host, source_path, target_module_dir, {:ignore => ignore_list}
+
               #rename to the selected module name, if not correct
               cur_path = File.join(target_module_dir, source_name)
+              if host.is_powershell? #make sure our slashes are correct
+                cur_path = cur_path.gsub(/\//,'\\')
+              end
               host.mv cur_path, target_path unless cur_path == target_path
             when 'rsync'
               logger.debug "Using rsync to transfer #{source_path} to #{target_path}"

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

@@ -102,9 +102,7 @@ module Beaker
             pe_debug = host[:pe_debug] || opts[:pe_debug] ? ' -verboseR' : ''
             "cd #{host['working_dir']} && hdiutil attach #{host['dist']}.dmg && installer#{pe_debug} -pkg /Volumes/puppet-enterprise-#{version}/puppet-enterprise-installer-#{version}.pkg -target /"
           elsif host['platform'] =~ /eos/
-            commands = ['enable', "extension puppet-enterprise-#{version}-#{host['platform']}.swix"]
-            command = commands.join("\n")
-            "Cli -c '#{command}'"
+            host.install_from_file("puppet-enterprise-#{version}-#{host['platform']}.swix")
           else
             pe_debug = host[:pe_debug] || opts[:pe_debug]  ? ' -D' : ''
             "cd #{host['working_dir']}/#{host['dist']} && ./#{host['pe_installer']}#{pe_debug} -a #{host['working_dir']}/answers"
@@ -218,9 +216,7 @@ module Beaker
             end
 
             if host['platform'] =~ /eos/
-              commands = ['enable', "copy #{path}/#{filename}#{extension} extension:"]
-              command = commands.join("\n")
-              on host, "Cli -c '#{command}'"
+              host.get_remote_file("#{path}/#{filename}#{extension}")
             else
               unpack = 'tar -xvf -'
               unpack = extension =~ /gz/ ? 'gunzip | ' + unpack  : unpack

data/lib/beaker/dsl/patterns.rb

@@ -19,7 +19,7 @@ module Beaker
       #                                                or Array<{Host}> to run the block against
       # @param [Block] block This method will yield to a block of code passed by the caller
       #
-      # @return [Array<Result>, Result] An array of results, or a result object.
+      # @return [Array<Result>, Result, nil] An array of results, a result object, or nil.
       #   Check {#run_block_on} for more details on this.
       def block_on hosts_or_filter, &block
         block_hosts = nil

data/lib/beaker/host.rb

@@ -49,6 +49,8 @@ module Beaker
         Mac::Host.new name, host_hash, options
       when /freebsd/
         FreeBSD::Host.new name, host_hash, options
+      when /eos/
+        Eos::Host.new name, host_hash, options
       else
         Unix::Host.new name, host_hash, options
       end
@@ -499,6 +501,7 @@ module Beaker
     'freebsd',
     'windows',
     'pswindows',
+    'eos',
   ].each do |lib|
     require "beaker/host/#{lib}"
   end

data/lib/beaker/host/eos.rb

@@ -0,0 +1,56 @@
+[ 'host', 'command_factory' ].each do |lib|
+  require "beaker/#{lib}"
+end
+
+module Eos
+  class Host < Unix::Host
+
+    # Gets the path & file name for the puppet agent package on EOS
+    #
+    # @param [String] puppet_collection Name of the puppet collection to use
+    # @param [String] puppet_agent_version Version of puppet agent to get
+    # @param [Hash{Symbol=>String}] opts Options hash to provide extra values
+    #
+    # @raise [ArgumentError] If one of the two required parameters (puppet_collection,
+    #   puppet_agent_version) is either not passed or set to nil
+    #
+    # @return [String, String] Path to the directory and filename of the package, respectively
+    def get_puppet_agent_package_info( puppet_collection = nil, puppet_agent_version = nil, opts = {} )
+      error_message = "Must provide %s argument to get puppet agent package information"
+      raise ArgumentError, error_message % "puppet_collection" unless puppet_collection
+      raise ArgumentError, error_message % "puppet_agent_version" unless puppet_agent_version
+
+      variant, version, arch, _ = self['platform'].to_array
+      release_path = "#{variant}/#{version}/#{puppet_collection}/#{arch}"
+      release_file = "puppet-agent-#{puppet_agent_version}-1.#{variant}#{version}.#{arch}.swix"
+      return release_path, release_file
+    end
+
+    # Copies a remote file to the host location specified
+    #
+    # @param [String] remote_url URL to the remote file
+    # @param [String] host_directory Path to the host directory on the host.
+    #
+    # @note in EOS, you just copy the file as an extension, you don't worry
+    #   about location, so that parameter is ignored
+    #
+    # @return [Result] The result of copying that file to the host
+    def get_remote_file( remote_url, host_directory = '' )
+      commands = ['enable', "copy #{remote_url} extension:"]
+      command = commands.join("\n")
+      execute("Cli -c '#{command}'")
+    end
+
+    # Installs an extension file already copied via {#get_remote_file} or something similar
+    #
+    # @param [String] filename Name of the file to install, including file extension
+    #
+    # @return [Result] The result of running the install command on the host
+    def install_from_file( filename )
+      commands = ['enable', "extension #{filename}"]
+      command = commands.join("\n")
+      execute("Cli -c '#{command}'")
+    end
+
+  end
+end

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

@@ -11,7 +11,7 @@ module Mac::Pkg
   end
 
   def uninstall_package(name, cmdline_args = '')
-    raise "Package #{name} cannot be installed on #{self}"
+    raise "Package #{name} cannot be uninstalled on #{self}"
   end
 
   # Upgrade an installed package to the latest available version

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

@@ -120,6 +120,24 @@ module Unix::Pkg
     end
   end
 
+  # Install a package using RPM
+  #
+  # @param [String] name          The name of the package to install.  It
+  #                               may be a filename or a URL.
+  # @param [String] cmdline_args  Additional command line arguments for
+  #                               the package manager.
+  # @option opts [String] :package_proxy  A proxy of form http://host:port
+  # 
+  # @return nil
+  # @api public
+  def install_package_with_rpm(name, cmdline_args = '', opts = {})
+    proxy = ''
+    if name =~ /^http/ and opts[:package_proxy]
+      proxy = extract_rpm_proxy_options(opts[:package_proxy])
+    end
+    execute("rpm #{cmdline_args} -ivh #{name} #{proxy}")
+  end
+
   def uninstall_package(name, cmdline_args = '', opts = {})
     case self['platform']
       when /sles-/
@@ -252,4 +270,22 @@ module Unix::Pkg
     end
   end
 
+  # Extract RPM command's proxy options from URL
+  #
+  # @param [String] url  A URL of form http://host:port
+  # @return [String]     httpproxy and httport options for rpm
+  #
+  # @raise [StandardError] When encountering a string that 
+  #                        cannot be parsed
+  # @api private
+  def extract_rpm_proxy_options(url)
+    begin
+      host, port = url.match(/https?:\/\/(.*):(\d*)/)[1,2]
+      raise if host.empty? or port.empty?
+      "--httpproxy #{host} --httpport #{port}"
+    rescue
+      raise "Cannot extract host and port from '#{url}'"
+    end
+  end
+
 end

data/lib/beaker/hypervisor/aws_sdk.rb

@@ -687,7 +687,7 @@ module Beaker
     # @return [String] safe key name for current host
     # @api private
     def key_name
-      "#{key_name_prefix}-#{@options[:timestamp].strftime("%F_%H_%M_%S")}"
+      "#{key_name_prefix}-#{@options[:aws_keyname_modifier]}-#{@options[:timestamp].strftime("%F_%H_%M_%S_%N")}"
     end
 
     # Returns the local user running this tool

data/lib/beaker/hypervisor/vagrant.rb

@@ -84,7 +84,7 @@ module Beaker
     def set_ssh_config host, user
         f = Tempfile.new("#{host.name}")
         ssh_config = Dir.chdir(@vagrant_path) do
-          stdin, stdout, stderr, wait_thr = Open3.popen3('vagrant', 'ssh-config', host.name)
+          stdin, stdout, stderr, wait_thr = Open3.popen3(@vagrant_env, 'vagrant', 'ssh-config', host.name)
           if not wait_thr.value.success?
             raise "Failed to 'vagrant ssh-config' for #{host.name}"
           end
@@ -128,7 +128,7 @@ module Beaker
       @vagrant_path = File.expand_path(File.join(File.basename(__FILE__), '..', '.vagrant', 'beaker_vagrant_files', File.basename(options[:hosts_file])))
       FileUtils.mkdir_p(@vagrant_path)
       @vagrant_file = File.expand_path(File.join(@vagrant_path, "Vagrantfile"))
-
+      @vagrant_env = { "RUBYLIB" => "" }
     end
 
     def provision(provider = nil)
@@ -182,7 +182,7 @@ module Beaker
     def vagrant_cmd(args)
       Dir.chdir(@vagrant_path) do
         exit_status = 1
-        Open3.popen3("vagrant #{args}") {|stdin, stdout, stderr, wait_thr|
+        Open3.popen3(@vagrant_env, "vagrant #{args}") {|stdin, stdout, stderr, wait_thr|
           while line = stdout.gets
             @logger.info(line)
           end

data/lib/beaker/logger.rb

@@ -357,6 +357,7 @@ module Beaker
         to.print color_code if @color
         to.send print_statement, msg
         to.print NORMAL if @color unless color_code == NONE
+        to.flush
       end
     end
 

data/lib/beaker/options/presets.rb

@@ -181,6 +181,11 @@ module Beaker
           :ec2_yaml               => 'config/image_templates/ec2.yaml',
           :help                   => false,
           :collect_perf_data      => 'none',
+          :puppetdb_port_ssl      => 8081,
+          :puppetdb_port_nonssl   => 8080,
+          :puppetserver_port      => 8140,
+          :nodeclassifier_port    => 4433,
+          :aws_keyname_modifier   => rand(10 ** 10).to_s.rjust(10,'0'), # 10 digit random number string
           :ssh                    => {
                                      :config                => false,
                                      :paranoid              => false,

data/lib/beaker/shared/host_manager.rb

@@ -74,11 +74,14 @@ module Beaker
       # @param [String, Symbol] filter Optional filter to apply to provided hosts - limits by name or role
       # @param [Block] block This method will yield to a block of code passed by the caller
       #
-      # @todo beaker3.0: simplify return types to Array<Result> only
+      # @todo (beaker3.0:BKR-571): simplify return types to Array<Result> only
       #
-      # @return [Array<Result>, Result] If a non-empty array of hosts has been
-      #   passed (after filtering), then an array of results is returned. Else,
-      #   a result object is returned.
+      # @return [Array<Result>, Result, nil] If an array of hosts has been
+      #   passed (after filtering), then either an array of results is returned
+      #   (if the array is non-empty), or nil is returned (if the array is empty).
+      #   Else, a result object is returned. If filtering makes it such that only
+      #   one host is left, then it's passed as a host object (not in an array),
+      #   and thus a result object is returned.
       def run_block_on hosts = [], filter = nil, &block
         result = nil
         block_hosts = hosts #the hosts to apply the block to after any filtering

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.27.0'
+    STRING = '2.28.0'
   end
 end

data/spec/beaker/dsl/helpers/puppet_helpers_spec.rb

@@ -894,5 +894,92 @@ describe ClassMixedWithDSLHelpers do
     end
   end
 
+  describe '#bounce_service' do
+    let( :options ) { Beaker::Options::Presets.new.presets }
+    before :each do
+      allow( subject ).to receive( :options ) { options }
+    end
+
+    it 'uses the default port argument if none given' do
+      host = hosts[0]
+      expect( host ).to receive( :graceful_restarts? ).and_return( false )
+      expect( subject ).to receive( :curl_with_retries ).with( anything(), anything(), /8140/, anything(), anything() )
+      subject.bounce_service( host, 'not_real_service')
+    end
+
+    it 'takes the port argument' do
+      host = hosts[0]
+      expect( host ).to receive( :graceful_restarts? ).and_return( false )
+      expect( subject ).to receive( :curl_with_retries ).with( anything(), anything(), /8000/, anything(), anything() )
+      subject.bounce_service( host, 'not_real_service', nil, 8000)
+    end
+  end
+
+  describe '#sleep_until_puppetdb_started' do
+    let( :options ) { Beaker::Options::Presets.new.presets }
+    before :each do
+      allow( subject ).to receive( :options ) { options }
+    end
+
+    it 'uses the default ports if none given' do
+      host = hosts[0]
+      expect( subject ).to receive( :curl_with_retries ).with( anything(), anything(), /8080/, anything(), anything() ).once.ordered
+      expect( subject ).to receive( :curl_with_retries ).with( anything(), anything(), /8081/, anything() ).once.ordered
+      subject.sleep_until_puppetdb_started( host )
+    end
+
+    it 'allows setting the nonssl_port' do
+      host = hosts[0]
+      expect( subject ).to receive( :curl_with_retries ).with( anything(), anything(), /8084/, anything(), anything() ).once.ordered
+      expect( subject ).to receive( :curl_with_retries ).with( anything(), anything(), /8081/, anything() ).once.ordered
+      subject.sleep_until_puppetdb_started( host, 8084 )
+
+    end
+
+    it 'allows setting the ssl_port' do
+      host = hosts[0]
+      expect( subject ).to receive( :curl_with_retries ).with( anything(), anything(), /8080/, anything(), anything() ).once.ordered
+      expect( subject ).to receive( :curl_with_retries ).with( anything(), anything(), /8085/, anything() ).once.ordered
+      subject.sleep_until_puppetdb_started( host, nil, 8085 )
+    end
+  end
+
+  describe '#sleep_until_puppetserver_started' do
+    let( :options ) { Beaker::Options::Presets.new.presets }
+    before :each do
+      allow( subject ).to receive( :options ) { options }
+    end
+
+    it 'uses the default port if none given' do
+      host = hosts[0]
+      expect( subject ).to receive( :curl_with_retries ).with( anything(), anything(), /8140/, anything() ).once.ordered
+      subject.sleep_until_puppetserver_started( host )
+    end
+
+    it 'allows setting the port' do
+      host = hosts[0]
+      expect( subject ).to receive( :curl_with_retries ).with( anything(), anything(), /8147/, anything() ).once.ordered
+      subject.sleep_until_puppetserver_started( host, 8147 )
+    end
+  end
+
+  describe '#sleep_until_nc_started' do
+    let( :options ) { Beaker::Options::Presets.new.presets }
+    before :each do
+      allow( subject ).to receive( :options ) { options }
+    end
+
+    it 'uses the default port if none given' do
+      host = hosts[0]
+      expect( subject ).to receive( :curl_with_retries ).with( anything(), anything(), /4433/, anything() ).once.ordered
+      subject.sleep_until_nc_started( host )
+    end
+
+    it 'allows setting the port' do
+      host = hosts[0]
+      expect( subject ).to receive( :curl_with_retries ).with( anything(), anything(), /4435/, anything() ).once.ordered
+      subject.sleep_until_nc_started( host, 4435 )
+    end
+  end
 
 end

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

@@ -182,6 +182,29 @@ describe ClassMixedWithDSLInstallUtils do
       url = subject.build_giturl('puppet', 'er0ck', 'github.com', 'ssh')
       expect(url).to be == 'git@github.com:er0ck/puppet.git'
     end
+
+    it 'uses ENV to build urls properly' do
+      allow(ENV).to receive(:[]).with('SERVER').and_return(nil)
+      allow(ENV).to receive(:[]).with('FORK').and_return(nil)
+      allow(ENV).to receive(:[]).with('PUPPET_FORK').and_return('er0ck/repo')
+      allow(ENV).to receive(:[]).with('PUPPET_SERVER').and_return('gitlab.com')
+      url = subject.build_giturl('puppet')
+      expect(url).to be == 'https://gitlab.com/er0ck/repo-puppet.git'
+      url = subject.build_giturl('puppet', 'er0ck')
+      expect(url).to be == 'https://gitlab.com/er0ck-puppet.git'
+      url = subject.build_giturl('puppet', 'er0ck', 'bitbucket.com')
+      expect(url).to be == 'https://bitbucket.com/er0ck-puppet.git'
+      url = subject.build_giturl('puppet', 'er0ck', 'github.com', 'https://')
+      expect(url).to be == 'https://github.com/er0ck/puppet.git'
+      url = subject.build_giturl('puppet', 'er0ck', 'github.com', 'https')
+      expect(url).to be == 'https://github.com/er0ck/puppet.git'
+      url = subject.build_giturl('puppet', 'er0ck', 'github.com', 'git@')
+      expect(url).to be == 'git@github.com:er0ck/puppet.git'
+      url = subject.build_giturl('puppet', 'er0ck', 'github.com', 'git')
+      expect(url).to be == 'git@github.com:er0ck/puppet.git'
+      url = subject.build_giturl('puppet', 'er0ck', 'github.com', 'ssh')
+      expect(url).to be == 'git@github.com:er0ck/puppet.git'
+    end
   end
 
   context 'extract_repo_info_from' do
@@ -396,7 +419,7 @@ describe ClassMixedWithDSLInstallUtils do
     context 'on el-6' do
       let(:platform) { Beaker::Platform.new('el-6-i386') }
       it 'installs' do
-        expect(subject).to receive(:on).with(hosts[0], /puppetlabs-release-el-6\.noarch\.rpm/)
+        expect(hosts[0]).to receive(:install_package_with_rpm).with(/puppetlabs-release-el-6\.noarch\.rpm/, '--replacepkgs', {:package_proxy=>false})
         expect(hosts[0]).to receive(:install_package).with('puppet')
         subject.install_puppet
       end
@@ -414,7 +437,7 @@ describe ClassMixedWithDSLInstallUtils do
     context 'on el-5' do
       let(:platform) { Beaker::Platform.new('el-5-i386') }
       it 'installs' do
-        expect(subject).to receive(:on).with(hosts[0], /puppetlabs-release-el-5\.noarch\.rpm/)
+        expect(hosts[0]).to receive(:install_package_with_rpm).with(/puppetlabs-release-el-5\.noarch\.rpm/, '--replacepkgs', {:package_proxy=>false})
         expect(hosts[0]).to receive(:install_package).with('puppet')
         subject.install_puppet
       end
@@ -422,7 +445,7 @@ describe ClassMixedWithDSLInstallUtils do
     context 'on fedora' do
       let(:platform) { Beaker::Platform.new('fedora-18-x86_84') }
       it 'installs' do
-        expect(subject).to receive(:on).with(hosts[0], /puppetlabs-release-fedora-18\.noarch\.rpm/)
+        expect(hosts[0]).to receive(:install_package_with_rpm).with(/puppetlabs-release-fedora-18\.noarch\.rpm/, '--replacepkgs', {:package_proxy=>false})
         expect(hosts[0]).to receive(:install_package).with('puppet')
         subject.install_puppet
       end
@@ -585,16 +608,6 @@ describe ClassMixedWithDSLInstallUtils do
 
     end
 
-    describe "When host is a redhat-like platform" do
-      let( :platform ) { Beaker::Platform.new('el-7-i386') }
-
-      it "installs an rpm" do
-        expect(subject).to receive(:on).with( host, /^(rpm --replacepkgs -ivh).*/ ).ordered
-        subject.install_puppetlabs_release_repo host
-      end
-
-    end
-
   end
 
   describe "#install_puppetlabs_dev_repo" do
@@ -754,10 +767,19 @@ describe ClassMixedWithDSLInstallUtils do
   end
 
   describe '#install_puppet_agent_from_msi_on' do
-    let( :opts )     { { :puppet_agent_version => 'VERSION' } }
+    let( :opts )     { { :puppet_agent_version => 'VERSION', :win_download_url => 'http://downloads.puppetlabs.com/windows' } }
     let( :platform ) { 'windows' }
     let( :host )     { { :platform => platform } }
 
+    it 'returns error when link incorrect' do
+      allow(subject).to receive(:link_exists?).with(anything()).and_return( false )
+      expect( host ).to receive( :is_x86_64? ).and_return( true )
+
+      expect{
+        subject.install_puppet_agent_from_msi_on( host, opts )
+      }.to raise_error(RuntimeError, /Puppet MSI at http:\/\/downloads.puppetlabs.com\/windows\/puppet-agent-VERSION-x64.msi does not exist!/)
+    end
+
     it 'uses x86 msi when host is_x86_64 and install_32 is set on the host' do
       host['install_32'] = true
 
@@ -1185,21 +1207,19 @@ describe ClassMixedWithDSLInstallUtils do
     let(:aixhost) { make_host('aix', :platform => 'aix-53-power') }
     let(:sol10host) { make_host('sol10', :platform => 'solaris-10-x86_64') }
     let(:sol11host) { make_host('sol11', :platform => 'solaris-11-x86_64') }
+    let(:cumulushost) { make_host('cumulus', :platform => 'cumulus-2.2-amd64') }
     let(:el6host) { make_host('el6', :platform => 'el-6-x64') }
 
     pkg_list = 'foo bar'
 
-    it 'uninstalls packages on aix, including tar' do
-      aix_depend_list = 'tar'
+    it 'uninstalls packages on aix' do
       result = Beaker::Result.new(aixhost,'')
       result.stdout = pkg_list
-      result2 = Beaker::Result.new(aixhost,'')
-      result2.stdout = aix_depend_list
 
-      expected_list = pkg_list + " " + aix_depend_list
+      expected_list = pkg_list
       cmd_args = ''
 
-      expect( subject ).to receive(:on).exactly(3).times.and_return(result, result2, result)
+      expect( subject ).to receive(:on).exactly(2).times.and_return(result, result)
       expect( aixhost ).to receive(:uninstall_package).with(expected_list, cmd_args)
 
       subject.remove_puppet_on( aixhost )
@@ -1231,6 +1251,19 @@ describe ClassMixedWithDSLInstallUtils do
       subject.remove_puppet_on( sol11host  )
     end
 
+    it 'uninstalls packages on cumulus' do
+      result = Beaker::Result.new(cumulushost,'')
+      result.stdout = pkg_list
+
+      expected_list = pkg_list
+      cmd_args = ''
+
+      expect( subject ).to receive(:on).exactly(2).times.and_return(result, result)
+      expect( cumulushost ).to receive(:uninstall_package).with(expected_list, cmd_args)
+
+      subject.remove_puppet_on( cumulushost  )
+    end
+
     it 'raises error on other platforms' do
       expect { subject.remove_puppet_on( el6host ) }.to raise_error(RuntimeError, /unsupported platform/)
     end