beaker 2.29.0 → 2.29.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzFmNmVhOTYzNjFkNjM3NjNmYTBjMDk3Njc1NGYwYmE2MGQ0NzM2ZA==
+    NDZlMGU2MGNjMGIzZmQxNzkyZjlhZjRhYmE1ODgwZDVlYTQ3ZTE3Yw==
   data.tar.gz: !binary |-
-    ZGIzM2M4YzE1MzZkYWNiNDNiMGYxMDc2ZmI0MTVkZmEzN2I4OThmOA==
+    OGY0NDVlMDJiNTk4Mjg0Mzk4MjVjOTdjN2JlOGI4YmNhNTAwYjRlNQ==
 SHA512:
   metadata.gz: !binary |-
-    NTA5Yjk4YWNkOWRmMjE5OGNlMGQ1NGQ2OTgwNWVhZjYyZjI5YjA1OTgxZWYx
-    NjM1ZjMxYzU2Yzg0MDViOWZkZjQzNzJhYjA2NmY5ZjU1MjMxNmMyMWU1MDli
-    M2U0NmI3Njk4OGU1YzIwYTM4NjVmOThhNmZjYzU0ODE0NTkzZDg=
+    NTYzNjJjODNkNDE1ZGU1MTYxNTQyMjZhZjM0MTQzZDc5MzQ4ZGM1Nzc4M2Y3
+    YWRkNWRhYjQwMGQyZWU2Y2I3Y2FiN2QxMTI5YTk2NDAzMTUxZDU4NTU3MmQ0
+    NGU0MWJiNzQ2N2JjMTYzMTMxYjQwNzA4NjdjN2ExNGRhOWJiZjY=
   data.tar.gz: !binary |-
-    OTVlN2UzYjljMWQxNjU4ODE0ZTlkYmY0NDg0NmNlZTliOTUyOGE5ZWU2MTQ5
-    NGE5OTRlYWE5NjRkZWY2N2IzOTFmNTY4ZjVjMjk2MDRhZjU0ZjRiMWU4ZGNh
-    ZWJjNTEzY2ZjYTVmYTEzZTZiOWY2ZTc4MTc3YTk4OWMxMWI3ZjI=
+    ZjFiZmE3NzNiODg0ODgyZTAwMzNjMjhiMmY4YzA5MWU5NWQ1ZjlmZDI5YTY5
+    MWVkY2U4NzZlMGEwNDY2YjU2MmM2NzRhOTEzYzRhOGVmNWMzYjk0N2FhODMx
+    ZWQ0MzQ1MWRlYjFiNGIxMzQ5ZDM5MjllNzMzYzhlY2JjNDk0YjA=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 18 Nov, 2015 (5ae7782f)](#LATEST)
+* [LATEST - 23 Nov, 2015 (5781838d)](#LATEST)
+* [2.29.0 - 18 Nov, 2015 (33fd2399)](#2.29.0)
 * [2.28.0 - 4 Nov, 2015 (89829551)](#2.28.0)
 * [2.27.0 - 21 Oct, 2015 (0378d13a)](#2.27.0)
 * [2.26.0 - 13 Oct, 2015 (427a512b)](#2.26.0)
@@ -101,7 +102,48 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 18 Nov, 2015 (5ae7782f)
+### <a name = "LATEST">LATEST - 23 Nov, 2015 (5781838d)
+
+* (GEM) update beaker version to 2.29.1 (5781838d)
+
+* Merge pull request #1019 from ody/bkr633_lesser_ruby (41647b80)
+
+
+```
+Merge pull request #1019 from ody/bkr633_lesser_ruby
+
+(BKR-633) Explicitly depend on mime-types.
+```
+* (BKR-633) Explicitly depend on mime-types. (99fb8b11)
+
+
+```
+(BKR-633) Explicitly depend on mime-types.
+
+  This commit will add an explicit dependency on the mime-types gem to
+  beaker's gemspec that installs versions less than 3.0 on systems with
+  a Ruby version less than 2.0.
+
+  This has to be done in order for beaker to install freshly on systems
+  where it hasn't been installed before.  The mime-types gem dropped
+  ruby 1.9.2 support with 3.0 and one of beaker's dependency, fog
+  depends on any version of mime-types greater than 0.
+```
+* Merge pull request #1009 from kevpl/bkr499_solaris10_fixups (22fe3324)
+
+
+```
+Merge pull request #1009 from kevpl/bkr499_solaris10_fixups
+
+(BKR-499) solaris10 fixups
+```
+* (BKR-499) refactoring set_env into host logic (a661dfe0)
+
+* (BKR-499) Solaris 10 Fixes (ba1289ca)
+
+### <a name = "2.29.0">2.29.0 - 18 Nov, 2015 (33fd2399)
+
+* (HISTORY) update beaker history for gem release 2.29.0 (33fd2399)
 
 * (GEM) update beaker version to 2.29.0 (5ae7782f)
 

data/acceptance/tests/base/dsl/helpers/host_helpers/create_remote_file_test.rb

@@ -57,9 +57,9 @@ test_name "dsl::helpers::host_helpers #create_remote_file" do
   end
 
   # NOTE: there does not seem to be a reliable way to confine to cygwin hosts.
-  confine_block :to, :platform => /windows|solaris.*10/ do
+  confine_block :to, :platform => /windows/ do
 
-    # NOTE: rsync methods are not working currently on windows and solaris 10 platforms
+    # NOTE: rsync methods are not working currently on windows platforms
 
     step "#create_remote_file CURRENTLY fails on #{default['platform']}, using rsync" do
       remote_tmpdir = tmpdir_on default
@@ -74,7 +74,7 @@ test_name "dsl::helpers::host_helpers #create_remote_file" do
     end
   end
 
-  confine_block :except, :platform => /windows|solaris.*10/ do
+  confine_block :except, :platform => /windows/ do
 
     step "#create_remote_file creates a remote file with the specified contents, using rsync" do
       remote_tmpdir = tmpdir_on default
@@ -137,9 +137,9 @@ test_name "dsl::helpers::host_helpers #create_remote_file" do
   end
 
   # NOTE: there does not appear to be a way to confine just to cygwin hosts
-  confine_block :to, :platform => /windows|solaris.*10/ do
+  confine_block :to, :platform => /windows/ do
 
-    # NOTE: rsync methods are not working currently on windows and solaris 10
+    # NOTE: rsync methods are not working currently on windows
     #       platforms. Would expect this to be documented better.
 
     step "#create_remote_file creates remote files on all remote hosts, when given an array, using rsync" do
@@ -158,7 +158,7 @@ test_name "dsl::helpers::host_helpers #create_remote_file" do
     end
   end
 
-  confine_block :except, :platform => /windows|solaris.*10|fedora/ do
+  confine_block :except, :platform => /windows|fedora/ do
 
     step "#create_remote_file creates remote files on all remote hosts, when given an array, using rsync" do
       remote_tmpdir = tmpdir_on default

data/acceptance/tests/base/dsl/helpers/host_helpers/install_package_test.rb

@@ -22,20 +22,11 @@ test_name "dsl::helpers::host_helpers #install_package" do
     end
   end
 
-  confine_block :to, :platform => /solaris/ do
-
-    step "#install_package CURRENTLY fails on solaris platforms" do
-      assert_raises Beaker::Host::CommandFailure do
-        install_package default, "rsync"
-      end
-    end
-  end
-
   confine_block :to, :platform => /osx/ do
     # TODO: install_package on OSX installs via a .dmg file -- how to test this?
   end
 
-  confine_block :except, :platform => /windows|solaris|osx/ do
+  confine_block :except, :platform => /windows|osx/ do
 
     step "#install_package fails if package is not known on the OS" do
       assert_raises Beaker::Host::CommandFailure do

data/acceptance/tests/base/dsl/helpers/host_helpers/rsync_to_test.rb

@@ -2,29 +2,6 @@ require "helpers/test_helper"
 
 test_name "dsl::helpers::host_helpers #rsync_to" do
 
-  confine_block :to, :platform => /^solaris.*10/ do
-
-    step "#rsync_to CURRENTLY will fail without error, but not copy the requested file, on #{default['platform']} due to lack of installed rsync" do
-
-      # NOTE: this should be documented
-      # FIXME: This is also true for CentOS/EL-*, but package removal appears
-      #        to not be working properly, so we cannot get test isolation
-      #        to test this as if the system is pristine.
-      Dir.mktmpdir do |local_dir|
-        local_filename, contents = create_local_file_from_fixture("simple_text_file", local_dir, "testfile.txt")
-        remote_tmpdir = tmpdir_on default
-
-        rsync_to default, local_filename, remote_tmpdir
-
-        remote_filename = File.join(remote_tmpdir, "testfile.txt")
-
-        assert_raises Beaker::Host::CommandFailure do
-          remote_contents = on(default, "cat #{remote_filename}").stdout
-        end
-      end
-    end
-  end
-
   confine_block :to, :platform => /^centos|el-\d|fedora/ do
     step "installing `rsync` on #{default['platform']} for all later test steps" do
       hosts.each do |host|
@@ -54,7 +31,7 @@ test_name "dsl::helpers::host_helpers #rsync_to" do
     end
   end
 
-  confine_block :except, :platform => /windows|solaris.*10/ do
+  confine_block :except, :platform => /windows/ do
 
     step "#rsync_to fails if the local file cannot be found" do
       remote_tmpdir = tmpdir_on default

data/acceptance/tests/base/dsl/helpers/host_helpers/upgrade_package_test.rb

@@ -33,18 +33,7 @@ test_name "dsl::helpers::host_helpers #upgrade_package" do
     end
   end
 
-  confine_block :to, :platform => /solaris/ do
-
-    step "#upgrade_package CURRENTLY fails on solaris platforms" do
-      # NOTE: pkgutil doesn't appear to be installed by default -- documentation
-      #       could be better here.
-      assert_raises Beaker::Host::CommandFailure do
-        upgrade_package default, "bash"
-      end
-    end
-  end
-
-  confine_block :except, :platform => /windows|solaris|osx/ do
+  confine_block :except, :platform => /windows|osx/ do
     confine_block :to, :platform => /centos|el-\d/ do
 
       step "#upgrade_package CURRENTLY does not fail on CentOS if unknown package is specified" do

data/acceptance/tests/base/host_prebuilt_steps/ssh_environment_test.rb

@@ -0,0 +1,32 @@
+test_name "confirm host prebuilt steps behave correctly" do
+
+  confine_block :except, :platform => /f5|windows/ do
+    step "confirm ssh environment file existence" do
+      hosts.each do |host|
+        assert(host.file_exist?(host[:ssh_env_file]))
+      end
+    end
+
+    step "confirm PATH env variable is set in the ssh environment file" do
+      hosts.each do |host|
+        assert(0 == on(host, "grep \"PATH\" #{host[:ssh_env_file]}").exit_code)
+      end
+    end
+  end
+
+  confine_block :to, :platform => /solaris-10/ do
+    step "confirm /opt/csw/bin has been added to the path" do
+      hosts.each do |host|
+        assert(0 == on(host, "grep \"/opt/csw/bin\" #{host[:ssh_env_file]}").exit_code)
+      end
+    end
+  end
+
+  confine_block :to, :platform => /openbsd/ do
+    step "confirm PKG_PATH is set in the ssh environment file" do
+      hosts.each do |host|
+        assert(0 == on(host, "grep \"PKG_PATH\" #{host[:ssh_env_file]}").exit_code)
+      end
+    end
+  end
+end

data/acceptance/tests/base/packages.rb

@@ -19,6 +19,8 @@ def get_host_pkg(host)
       Beaker::HostPrebuiltSteps::FREEBSD_PACKAGES
     when host['platform'] =~ /openbsd/
       Beaker::HostPrebuiltSteps::OPENBSD_PACKAGES
+    when host['platform'] =~ /solaris-10/
+      Beaker::HostPrebuiltSteps::SOLARIS10_PACKAGES
     else
       Beaker::HostPrebuiltSteps::UNIX_PACKAGES
   end
@@ -48,8 +50,9 @@ hosts.each do |host|
   # this works on Windows as well, althought it pulls in
   # a lot of dependencies.
   package = 'zsh'
+  package = 'CSWzsh' if host['platform'] =~ /solaris-10/
 
-  if host['platform'] =~ /solaris/
+  if host['platform'] =~ /solaris-11/
     logger.debug("#{package} should be uninstalled on #{host}")
     host.uninstall_package(package)
     assert_equal(false, host.check_for_package(package), "'#{package}' should not be installed")

data/beaker.gemspec

@@ -51,6 +51,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'google-api-client', '~> 0.8'
   s.add_runtime_dependency 'aws-sdk', '~> 1.57'
   s.add_runtime_dependency 'docker-api'
+  s.add_runtime_dependency 'mime-types', '~> 2.99' if RUBY_VERSION < '2.0' # dropped ruby 1.9 rupport in 3.0
   s.add_runtime_dependency 'fog-google', '~> 0.0.9' # dropped ruby 1.9 support in 0.1
   s.add_runtime_dependency 'fog', ['~> 1.25', '< 1.35.0']
 

data/lib/beaker/host/aix.rb

@@ -1,5 +1,5 @@
 [ 'host', 'command_factory' ].each do |lib|
-    require "beaker/#{lib}"
+  require "beaker/#{lib}"
 end
 
 module Aix

data/lib/beaker/host/aix/exec.rb

@@ -8,4 +8,22 @@ module Aix::Exec
   def get_ip
     execute("ifconfig -a inet| awk '/broadcast/ {print $2}' | cut -d/ -f1 | head -1").strip
   end
+
+  # Restarts the SSH service
+  #
+  # @return [Result] result of starting ssh service
+  def ssh_service_restart
+    exec(Beaker::Command.new("stopsrc -g ssh"))
+    exec(Beaker::Command.new("startsrc -g ssh"))
+  end
+
+  # Sets the PermitUserEnvironent setting & restarts the SSH service
+  #
+  # @api private
+  # @return [Result] result of the command starting the SSH service
+  #   (from {#ssh_service_restart}).
+  def ssh_permit_user_environment
+    exec(Beaker::Command.new("echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
+    ssh_service_restart()
+  end
 end

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

@@ -5,4 +5,26 @@ module Mac::Exec
     (abs ? '/usr/bin/touch' : 'touch') + " #{file}"
   end
 
+  # Restarts the SSH service
+  #
+  # @return [Result] result of starting SSH service
+  def ssh_service_restart
+    launch_daemons_plist = '/System/Library/LaunchDaemons/ssh.plist'
+    exec(Beaker::Command.new("launchctl unload #{launch_daemons_plist}"))
+    exec(Beaker::Command.new("launchctl load #{launch_daemons_plist}"))
+  end
+
+  # Sets the PermitUserEnvironment setting & restarts the SSH service
+  #
+  # @api private
+  # @return [Result] result of the command starting the SSH service
+  #   (from {#ssh_service_restart})
+  def ssh_permit_user_environment
+    ssh_config_file = '/etc/sshd_config'
+    ssh_config_file = '/private/etc/ssh/sshd_config' if self['platform'] =~ /osx-10\.*11/
+
+    exec(Beaker::Command.new("echo '\nPermitUserEnvironment yes' >> #{ssh_config_file}"))
+    ssh_service_restart()
+  end
+
 end

data/lib/beaker/host/pswindows/exec.rb

@@ -148,4 +148,28 @@ module PSWindows::Exec
     self.close #refresh the state
   end
 
+  # Overrides the {Windows::Exec#ssh_permit_user_environment} method,
+  # since no steps are needed in this setup to allow user ssh environments
+  # to work.
+  def ssh_permit_user_environment
+  end
+
+  # Sets the user SSH environment.
+  #
+  # @param [Hash{String=>String}] env Environment variables to set on the system,
+  #                                   in the form of a hash of String variable
+  #                                   names to their corresponding String values.
+  #
+  # @note this class doesn't manipulate an SSH environment file, it just sets
+  # the environment variables on the system.
+  #
+  # @api private
+  # @return nil
+  def ssh_set_user_environment(env)
+    #add the env var set to this test host
+    env.each_pair do |var, value|
+      add_env_var(var, value)
+    end
+  end
+
 end

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

@@ -159,4 +159,82 @@ module Unix::Exec
     mirror_env_to_profile_d(env_file)
   end
 
+  # Restarts the SSH service.
+  #
+  # @return [Result] result of restarting the SSH service
+  def ssh_service_restart
+    case self['platform']
+    when /debian|ubuntu|cumulus/
+      exec(Beaker::Command.new("service ssh restart"))
+    when /el-7|centos-7|redhat-7|oracle-7|scientific-7|eos-7/
+      exec(Beaker::Command.new("systemctl restart sshd.service"))
+    when /el-|centos|fedora|redhat|oracle|scientific|eos/
+      exec(Beaker::Command.new("/sbin/service sshd restart"))
+    when /sles/
+      exec(Beaker::Command.new("rcsshd restart"))
+    when /solaris/
+      exec(Beaker::Command.new("svcadm restart svc:/network/ssh:default"))
+    when /(free|open)bsd/
+      exec(Beaker::Command.new("sudo /etc/rc.d/sshd restart"))
+    end
+  end
+
+  # Sets the PermitUserEnvironment setting & restarts the SSH service.
+  #
+  # @api private
+  # @return [Result] result of the command restarting the SSH service
+  #   (from {#ssh_service_restart}).
+  def ssh_permit_user_environment
+    case self['platform']
+    when /debian|ubuntu|cumulus/
+      exec(Beaker::Command.new("echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
+    when /el-7|centos-7|redhat-7|oracle-7|scientific-7|eos-7/
+      exec(Beaker::Command.new("echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
+    when /el-|centos|fedora|redhat|oracle|scientific|eos/
+      exec(Beaker::Command.new("echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
+    when /sles/
+      exec(Beaker::Command.new("echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
+    when /solaris/
+      # kept solaris here because refactoring it into its own Host module
+      # conflicts with the solaris hypervisor that already exists
+      exec(Beaker::Command.new("echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
+    when /(free|open)bsd/
+      exec(Beaker::Command.new("sudo perl -pi -e 's/^#?PermitUserEnvironment no/PermitUserEnvironment yes/' /etc/ssh/sshd_config"), {:pty => true} )
+    end
+
+    ssh_service_restart()
+  end
+
+  # Fills the user SSH environment file.
+  #
+  # @param [Hash{String=>String}] env Environment variables to set on the system,
+  #                                   in the form of a hash of String variable
+  #                                   names to their corresponding String values.
+  #
+  # @api private
+  # @return nil
+  def ssh_set_user_environment(env)
+    #ensure that ~/.ssh/environment exists
+    ssh_env_file_dir = Pathname.new(self[:ssh_env_file]).dirname
+    mkdir_p(ssh_env_file_dir)
+    exec(Beaker::Command.new("chmod 0600 #{ssh_env_file_dir}"))
+    exec(Beaker::Command.new("touch #{self[:ssh_env_file]}"))
+    #add the constructed env vars to this host
+    add_env_var('PATH', '$PATH')
+    # FIXME
+    if self['platform'] =~ /openbsd-(\d)\.?(\d)-(.+)/
+      version = "#{$1}.#{$2}"
+      arch = $3
+      arch = 'amd64' if ['x64', 'x86_64'].include?(arch)
+      add_env_var('PKG_PATH', "http://ftp.openbsd.org/pub/OpenBSD/#{version}/packages/#{arch}/")
+    elsif self['platform'] =~ /solaris-10/
+      add_env_var('PATH', '/opt/csw/bin')
+    end
+
+    #add the env var set to this test host
+    env.each_pair do |var, value|
+      add_env_var(var, value)
+    end
+  end
+
 end

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

@@ -11,7 +11,11 @@ module Unix::Pkg
     result = exec(Beaker::Command.new("which #{name}"), :accept_all_exit_codes => true)
     case self['platform']
     when /solaris-10/
-      result.stdout =~ %r|/.*/#{name}|
+      # solaris 10 appears to have considered `which` to have run successfully,
+      # even if the command didn't exist, so it'll return a 0 exit code in
+      # either case. Instead we match for the phrase output when a match isn't
+      # found: "no #{name} in $PATH", reversing it to match our API
+      !( result.stdout.match(/^no\ #{name}\ in\ /) )
     else
       result.exit_code == 0
     end
@@ -36,6 +40,9 @@ module Unix::Pkg
         result = execute("pkg info #{name}", opts) { |result| result }
       when /solaris-10/
         result = execute("pkginfo #{name}", opts) { |result| result }
+        if result.exit_code == 1
+          result = execute("pkginfo CSW#{name}", opts) { |result| result }
+        end
       when /freebsd-9/
         result = execute("pkg_info #{name}", opts) { |result| result }
       when /freebsd-10/
@@ -82,6 +89,11 @@ module Unix::Pkg
         update_apt_if_needed
         execute("apt-get install --force-yes #{cmdline_args} -y #{name}", opts)
       when /solaris-11/
+        if opts[:acceptable_exit_codes]
+          opts[:acceptable_exit_codes] << 4
+        else
+          opts[:acceptable_exit_codes] = [0, 4] unless opts[:accept_all_exit_codes]
+        end
         execute("pkg #{cmdline_args} install #{name}", opts)
       when /solaris-10/
         execute("pkgutil -i -y #{cmdline_args} #{name}", opts)
@@ -180,9 +192,14 @@ module Unix::Pkg
         update_apt_if_needed
         execute("apt-get install -o Dpkg::Options::='--force-confold' #{cmdline_args} -y --force-yes #{name}", opts)
       when /solaris-11/
+        if opts[:acceptable_exit_codes]
+          opts[:acceptable_exit_codes] << 4
+        else
+          opts[:acceptable_exit_codes] = [0, 4] unless opts[:accept_all_exit_codes]
+        end
         execute("pkg #{cmdline_args} update #{name}", opts)
       when /solaris-10/
-        execute("pkgutil -u -y #{cmdline_args} ${name}", opts)
+        execute("pkgutil -u -y #{cmdline_args} #{name}", opts)
       else
         raise "Package #{name} cannot be upgraded on #{self}"
     end

data/lib/beaker/host/windows/exec.rb

@@ -50,4 +50,30 @@ module Windows::Exec
     result.exit_code == 0
   end
 
+  # Restarts the SSH service.
+  #
+  # @return [Result] result of starting SSH service
+  def ssh_service_restart
+    command_result = nil
+    # we get periodic failures to restart the service, so looping these with re-attempts
+    repeat_fibonacci_style_for(5) do
+      0 == exec(Beaker::Command.new("cygrunsrv -E sshd"), :acceptable_exit_codes => [0, 1] ).exit_code
+    end
+    repeat_fibonacci_style_for(5) do
+      command_result = exec(Beaker::Command.new("cygrunsrv -S sshd"), :acceptable_exit_codes => [0, 1] )
+      0 == command_result.exit_code
+    end
+    command_result
+  end
+
+  # Sets the PermitUserEnvironment setting & restarts the SSH service
+  #
+  # @api private
+  # @return [Result] result of the command starting the SSH service
+  #   (from {#ssh_service_restart}).
+  def ssh_permit_user_environment
+    exec(Beaker::Command.new("echo '\nPermitUserEnvironment yes' >> /etc/sshd_config"))
+    ssh_service_restart()
+  end
+
 end

data/lib/beaker/host_prebuilt_steps.rb

@@ -21,6 +21,7 @@ module Beaker
     SLES_PACKAGES = ['curl', 'ntp']
     DEBIAN_PACKAGES = ['curl', 'ntpdate', 'lsb-release']
     CUMULUS_PACKAGES = ['curl', 'ntpdate']
+    SOLARIS10_PACKAGES = ['CSWcurl', 'CSWntp']
     ETC_HOSTS_PATH = "/etc/hosts"
     ETC_HOSTS_PATH_SOLARIS = "/etc/inet/hosts"
     ROOT_KEYS_SCRIPT = "https://raw.githubusercontent.com/puppetlabs/puppetlabs-sshkeys/master/templates/scripts/manage_root_authorized_keys"
@@ -107,6 +108,8 @@ module Beaker
           check_and_install_packages_if_needed(host, FREEBSD_PACKAGES)
         when host['platform'] =~ /openbsd/
           check_and_install_packages_if_needed(host, OPENBSD_PACKAGES)
+        when host['platform'] =~ /solaris-10/
+          check_and_install_packages_if_needed(host, SOLARIS10_PACKAGES)
         when host['platform'] !~ /debian|aix|solaris|windows|sles-|osx-|cumulus|f5-/
           check_and_install_packages_if_needed(host, UNIX_PACKAGES)
         end
@@ -523,72 +526,13 @@ module Beaker
         next if host['platform'] =~ /f5/
         env = construct_env(host, opts)
         logger.debug("setting local environment on #{host.name}")
-        case host['platform']
-        when /windows/
-          if host.is_cygwin?
-            host.exec(Command.new("echo '\nPermitUserEnvironment yes' >> /etc/sshd_config"))
-            # we get periodic failures to restart the service, so looping these with re-attempts
-            repeat_fibonacci_style_for(5) do
-              0 == host.exec(Command.new("cygrunsrv -E sshd"), :acceptable_exit_codes => [0, 1] ).exit_code
-            end
-            repeat_fibonacci_style_for(5) do
-              0 == host.exec(Command.new("cygrunsrv -S sshd"), :acceptable_exit_codes => [0, 1] ).exit_code
-            end
-            env['CYGWIN'] = 'nodosfilewarning'
-          else
-            #nothing to do here
-          end
-        when /osx-10\.*11/
-          host.exec(Command.new("echo '\nPermitUserEnvironment yes' >> /private/etc/ssh/sshd_config"))
-          host.exec(Command.new("launchctl unload /System/Library/LaunchDaemons/ssh.plist"))
-          host.exec(Command.new("launchctl load /System/Library/LaunchDaemons/ssh.plist"))
-        when /osx/
-          host.exec(Command.new("echo '\nPermitUserEnvironment yes' >> /etc/sshd_config"))
-          host.exec(Command.new("launchctl unload /System/Library/LaunchDaemons/ssh.plist"))
-          host.exec(Command.new("launchctl load /System/Library/LaunchDaemons/ssh.plist"))
-        when /debian|ubuntu|cumulus/
-          host.exec(Command.new("echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
-          host.exec(Command.new("service ssh restart"))
-        when /el-7|centos-7|redhat-7|oracle-7|scientific-7|eos-7/
-          host.exec(Command.new("echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
-          host.exec(Command.new("systemctl restart sshd.service"))
-        when /el-|centos|fedora|redhat|oracle|scientific|eos/
-          host.exec(Command.new("echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
-          host.exec(Command.new("/sbin/service sshd restart"))
-        when /sles/
-          host.exec(Command.new("echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
-          host.exec(Command.new("rcsshd restart"))
-        when /solaris/
-          host.exec(Command.new("echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
-          host.exec(Command.new("svcadm restart svc:/network/ssh:default"))
-        when /aix/
-          host.exec(Command.new("echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
-          host.exec(Command.new("stopsrc -g ssh"))
-          host.exec(Command.new("startsrc -g ssh"))
-        when /(free|open)bsd/
-          host.exec(Command.new("sudo perl -pi -e 's/^#?PermitUserEnvironment no/PermitUserEnvironment yes/' /etc/ssh/sshd_config"), {:pty => true} )
-          host.exec(Command.new("sudo /etc/rc.d/sshd restart"))
+        if host['platform'] =~ /windows/ and host.is_cygwin?
+          env['CYGWIN'] = 'nodosfilewarning'
         end
+        host.ssh_permit_user_environment()
+
+        host.ssh_set_user_environment(env)
 
-        if not host.is_powershell?
-          #ensure that ~/.ssh/environment exists
-          host.exec(Command.new("mkdir -p #{Pathname.new(host[:ssh_env_file]).dirname}"))
-          host.exec(Command.new("chmod 0600 #{Pathname.new(host[:ssh_env_file]).dirname}"))
-          host.exec(Command.new("touch #{host[:ssh_env_file]}"))
-          #add the constructed env vars to this host
-          host.add_env_var('PATH', '$PATH')
-          # FIXME
-          if host['platform'] =~ /openbsd-(\d)\.?(\d)-(.+)/
-            version = "#{$1}.#{$2}"
-            arch = $3
-            arch = 'amd64' if ['x64', 'x86_64'].include?(arch)
-            host.add_env_var('PKG_PATH', "http://ftp.openbsd.org/pub/OpenBSD/#{version}/packages/#{arch}/")
-          end
-        end
-        #add the env var set to this test host
-        env.each_pair do |var, value|
-          host.add_env_var(var, value)
-        end
         # REMOVE POST BEAKER 3: backwards compatability, do some setup based upon the global type
         # this is the worst and i hate it
         Class.new.extend(Beaker::DSL).configure_type_defaults_on(host)

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.29.0'
+    STRING = '2.29.1'
   end
 end

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -492,71 +492,69 @@ describe Beaker do
   context "set_env" do
     subject { dummy_class.new }
 
-    it "can set the environment on a windows host" do
-      commands = [
-        "echo '\nPermitUserEnvironment yes' >> /etc/sshd_config",
-        "cygrunsrv -E sshd",
-        "cygrunsrv -S sshd"
-      ]
-      set_env_helper('windows', commands)
+    it "permits user environments on an OS X host" do
+      test_host_ssh_permit_user_environment('osx')
     end
 
-    it "can set the environment on an OS X host" do
-      commands = [
-        "echo '\nPermitUserEnvironment yes' >> /etc/sshd_config",
-        "launchctl unload /System/Library/LaunchDaemons/ssh.plist",
-        "launchctl load /System/Library/LaunchDaemons/ssh.plist"
-      ]
-      set_env_helper('osx', commands)
+    it "permits user environments on an ssh-based linux host" do
+      test_host_ssh_permit_user_environment('ubuntu')
     end
 
-    it "can set the environment on an ssh-based linux host" do
-      commands = [
-        "echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config",
-        "service ssh restart"
-      ]
-      set_env_helper('ubuntu', commands)
+    it "permits user environments on an sshd-based linux host" do
+      test_host_ssh_permit_user_environment('eos')
     end
 
-    it "can set the environment on an sshd-based linux host" do
-      commands = [
-          "echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config",
-          "/sbin/service sshd restart"
-      ]
-      set_env_helper('eos', commands)
+    it "permits user environments on an sles host" do
+      test_host_ssh_permit_user_environment('sles')
     end
 
-    it "can set the environment on an sles host" do
-      commands = [
-        "echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config",
-        "rcsshd restart"
-      ]
-      set_env_helper('sles', commands)
+    it "permits user environments on a solaris host" do
+      test_host_ssh_permit_user_environment('solaris')
     end
 
-    it "can set the environment on a solaris host" do
-      commands = [
-        "echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config",
-        "svcadm restart svc:/network/ssh:default"
-      ]
-      set_env_helper('solaris', commands)
+    it "permits user environments on an aix host" do
+      test_host_ssh_permit_user_environment('aix')
     end
 
-    it "can set the environment on an aix host" do
-      commands = [
-        "echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config",
-        "stopsrc -g ssh",
-        "startsrc -g ssh"
-      ]
-      set_env_helper('aix', commands)
+    it "permits user environments on a FreeBSD host" do
+      test_host_ssh_permit_user_environment('freebsd')
     end
 
-    it "can set the environment on a FreeBSD host" do
-      commands = [
-        "sudo perl -pi -e 's/^#?PermitUserEnvironment no/PermitUserEnvironment yes/' /etc/ssh/sshd_config",
-        "sudo /etc/rc.d/sshd restart",
-      ]
-      set_env_helper('freebsd', commands)
+    it "permits user environments on a windows host" do
+      test_host_ssh_permit_user_environment('windows')
+    end
+
+
+    it "sets user ssh environment on an OS X host" do
+      test_host_ssh_set_user_environment('osx')
+    end
+
+    it "sets user ssh environment on an ssh-based linux host" do
+      test_host_ssh_set_user_environment('ubuntu')
+    end
+
+    it "sets user ssh environment on an sshd-based linux host" do
+      test_host_ssh_set_user_environment('eos')
+    end
+
+    it "sets user ssh environment on an sles host" do
+      test_host_ssh_set_user_environment('sles')
+    end
+
+    it "sets user ssh environment on a solaris host" do
+      test_host_ssh_set_user_environment('solaris')
+    end
+
+    it "sets user ssh environment on an aix host" do
+      test_host_ssh_set_user_environment('aix')
+    end
+
+    it "sets user ssh environment on a FreeBSD host" do
+      test_host_ssh_set_user_environment('freebsd')
+    end
+
+    it "sets user ssh environment on a windows host" do
+      test_host_ssh_set_user_environment('windows')
     end
 
     it "skips an f5 host correctly" do
@@ -585,33 +583,27 @@ describe Beaker do
       subject.set_env(host, options.merge( opts ))
     end
 
-    def set_env_helper(platform_name, host_specific_commands_array)
+    def test_host_ssh_permit_user_environment(platform_name)
+      test_host_ssh_calls(platform_name, :ssh_permit_user_environment)
+    end
+
+    def test_host_ssh_set_user_environment(platform_name)
+      test_host_ssh_calls(platform_name, :ssh_set_user_environment)
+    end
+
+    def test_host_ssh_calls(platform_name, method_call_sym)
       host = make_host('name', {
           :platform     => platform_name,
           :ssh_env_file => 'ssh_env_file',
           :is_cygwin   => true,
-      } )
+        } )
       opts = {
-          :env1_key => :env1_value,
-          :env2_key => :env2_value
+        :env1_key => :env1_value,
+        :env2_key => :env2_value
       }
 
       expect( subject ).to receive( :construct_env ).and_return( opts )
-      host_specific_commands_array.each do |command|
-        expect( Beaker::Command ).to receive( :new ).with( command ).once
-      end
-
-      expect( Beaker::Command ).to receive( :new ).with( "mkdir -p #{Pathname.new(host[:ssh_env_file]).dirname}" ).once
-      expect( Beaker::Command ).to receive( :new ).with( "chmod 0600 #{Pathname.new(host[:ssh_env_file]).dirname}" ).once
-      expect( Beaker::Command ).to receive( :new ).with( "touch #{host[:ssh_env_file]}" ).once
-      expect_any_instance_of( Class ).to receive( :extend ).and_return( double( 'class' ).as_null_object )
-      expect( Beaker::Command ).to receive( :new ).with( "cat #{host[:ssh_env_file]}" ).once
-      expect( host ).to receive( :add_env_var ).with( 'PATH', '$PATH' ).once
-      opts.each_pair do |key, value|
-        expect( host ).to receive( :add_env_var ).with( key, value ).once
-      end
-      expect( host ).to receive( :add_env_var ).with( 'CYGWIN', 'nodosfilewarning' ).once if platform_name =~ /windows/
-      expect( host ).to receive( :exec ).exactly( host_specific_commands_array.length + 4 ).times
+      expect( host ).to receive( method_call_sym )
 
       subject.set_env(host, options.merge( opts ))
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.29.0
+  version: 2.29.1
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -360,6 +360,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.99'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   name: fog-google
   requirement: !ruby/object:Gem::Requirement
@@ -505,6 +519,7 @@ files:
 - acceptance/tests/base/dsl/helpers/host_helpers/upgrade_package_test.rb
 - acceptance/tests/base/dsl/install_utils/clone_git_repo_on_test.rb
 - acceptance/tests/base/dsl/structure_test.rb
+- acceptance/tests/base/host_prebuilt_steps/ssh_environment_test.rb
 - acceptance/tests/base/host_test.rb
 - acceptance/tests/base/packages.rb
 - acceptance/tests/base/packages_unix.rb