beaker 4.28.1 → 4.31.0

data/README.md

@@ -1,5 +1,13 @@
 # Beaker
 
+[![License](https://img.shields.io/github/license/voxpupuli/beaker.svg)](https://github.com/voxpupuli/beaker/blob/master/LICENSE)
+[![Test](https://github.com/voxpupuli/beaker/actions/workflows/test.yml/badge.svg)](https://github.com/voxpupuli/beaker/actions/workflows/test.yml)
+[![codecov](https://codecov.io/gh/voxpupuli/beaker/branch/master/graph/badge.svg?token=Mypkl78hvK)](https://codecov.io/gh/voxpupuli/beaker)
+[![Release](https://github.com/voxpupuli/beaker/actions/workflows/release.yml/badge.svg)](https://github.com/voxpupuli/beaker/actions/workflows/release.yml)
+[![RubyGem Version](https://img.shields.io/gem/v/beaker.svg)](https://rubygems.org/gems/beaker)
+[![RubyGem Downloads](https://img.shields.io/gem/dt/beaker.svg)](https://rubygems.org/gems/beaker)
+[![Donated by Puppet Inc](https://img.shields.io/badge/donated%20by-Puppet%20Inc-fb7047.svg)](#transfer-notice)
+
 Beaker is a test harness focused on acceptance testing via interactions between multiple (virtual) machines. It provides platform abstraction between different Systems Under Test (SUTs), and it can also be used as a virtual machine provisioner - setting up machines, running any commands on those machines, and then exiting.
 
 Beaker runs tests written in Ruby, and provides additional Domain-Specific Language (DSL) methods.  This gives you access to all standard Ruby along with acceptance testing specific commands.
@@ -24,10 +32,6 @@ Documentation for Beaker can be found in this repository in
 
 Beaker functionality has been extended through the use of libraries available as gems. See the [complete list](docs/concepts/beaker_libraries.md) for available gems. See the [beaker-template documentation](https://github.com/puppetlabs/beaker-template/blob/master/README.md) for documentation on creating beaker-libraries.
 
-# License
-
-See [LICENSE](LICENSE) file.
-
 # Support & Issues
 
 Please log tickets and issues at our [Beaker Issue Tracker](https://tickets.puppetlabs.com/issues/?jql=project%20%3D%20BKR). In addition there is an active #puppet-dev channel on Freenode.
@@ -42,11 +46,24 @@ If you'd like to contribute improvements to Beaker, please see [CONTRIBUTING](CO
 
 For information on project maintainers, please check out our [CODEOWNERS doc](CODEOWNERS).
 
-# Releasing
+## Transfer Notice
+
+This plugin was originally authored by [Puppet Inc](http://puppet.com).
+The maintainer preferred that Puppet Community take ownership of the module for future improvement and maintenance.
+Existing pull requests and issues were transferred over, please fork and continue to contribute here.
+
+Previously: https://github.com/puppetlabs/beaker
+
+## License
 
-Since the beaker project has always been the central hub for all beaker testing, its release process has been more involved than most beaker-libraries (ie. [beaker-puppet](https://github.com/puppetlabs/beaker-puppet)).
-Historically, the process has been described in [Confluence: Beaker Release Process](https://confluence.puppetlabs.com/display/SRE/Beaker+Release+Process) (apologies, most links in this section are Puppet-internal).
+This gem is licensed under the Apache-2 license.
 
-To release new versions of beaker, please use this [jenkins job](https://jenkins-sre.delivery.puppetlabs.net/view/all/job/qe_beaker-gem_init-multijob_master/). This job lives on internal infrastructure.
+## Release information
 
-To run the job, click on `Build with Parameters` in the menu on the left. Make sure you verify the checkbox next to `PUBLIC` is checked and enter the appropriate version. The version should adhere to semantic version standards. When in doubt, consult [the maintainers of Beaker](#maintainers) for guidance.
+To make a new release, please do:
+* update the version in the gemspec file
+* Install gems with `bundle install --with release --path .vendor`
+* generate the changelog with `bundle exec rake changelog`
+* Check if the new version matches the closed issues/PRs in the changelog
+* Create a PR with it
+* After it got merged, push a tag. GitHub actions will do the actual release to rubygems and GitHub Packages

data/Rakefile

@@ -328,3 +328,19 @@ namespace :docs do
     end
   end
 end
+
+begin
+  require 'rubygems'
+  require 'github_changelog_generator/task'
+
+  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+    config.exclude_labels = %w{duplicate question invalid wontfix wont-fix skip-changelog}
+    config.user = 'voxpupuli'
+    config.project = 'beaker'
+    config.max_issues = 50
+    config.since_tag = "4.30.0"
+    gem_version = Gem::Specification.load("#{config.project}.gemspec").version
+    config.future_release = gem_version
+  end
+rescue LoadError
+end

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

@@ -97,7 +97,7 @@ test_name "dsl::helpers::host_helpers #deploy_package_repo" do
     end
   end
 
-  confine_block :to, :platform => /sles/i do
+  confine_block :to, :platform => /opensuse|sles/i do
 
     step "#deploy_package_repo updates zypper repository list on the remote host" do
       Dir.mktmpdir do |local_dir|
@@ -119,7 +119,7 @@ test_name "dsl::helpers::host_helpers #deploy_package_repo" do
     end
   end
 
-  confine_block :except, :platform => /el-\d|fedora|centos|eos|ubuntu|debian|cumulus|sles/i do
+  confine_block :except, :platform => /el-\d|fedora|centos|eos|ubuntu|debian|cumulus|opensuse|sles/i do
 
     # OS X, windows (cygwin, powershell), solaris, etc.
 

data/acceptance/tests/base/host/packages.rb

@@ -5,7 +5,7 @@ def get_host_pkg(host)
   case
     when host['platform'] =~ /sles-10/
       Beaker::HostPrebuiltSteps::SLES10_PACKAGES
-    when host['platform'] =~ /sles-/
+    when host['platform'] =~ /opensuse|sles-/
       Beaker::HostPrebuiltSteps::SLES_PACKAGES
     when host['platform'] =~ /debian/
       Beaker::HostPrebuiltSteps::DEBIAN_PACKAGES
@@ -53,7 +53,7 @@ hosts.each do |host|
   next if host['platform'] =~ /windows/
   package = 'zsh'
   package = 'CSWzsh' if host['platform'] =~ /solaris-10/
-  package = 'git' if host['platform'] =~ /sles/
+  package = 'git' if host['platform'] =~ /opensuse|sles/
 
   if host['platform'] =~ /solaris-11/
     logger.debug("#{package} should be uninstalled on #{host}")

data/beaker.gemspec

@@ -24,15 +24,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rspec-its'
   s.add_development_dependency 'fakefs', '~> 1.0'
-  s.add_development_dependency 'simplecov'
   s.add_development_dependency 'rake', '~> 13.0'
 
-  # Provisioner dependencies - needed for acceptance tests
-  # TODO: figure out how to remove these
-  s.add_development_dependency 'beaker-aws', '~> 0.1'
-  s.add_development_dependency 'beaker-abs', '~> 0.4'
-  s.add_development_dependency 'beaker-vmpooler', '~> 1.0'
-
   # Documentation dependencies
   s.add_development_dependency 'yard', '~> 0.9.11'
 
@@ -42,6 +35,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'pry-byebug', '~> 3.9'
   # pry-byebug can have issues with native readline libs so add rb-readline
   s.add_runtime_dependency 'rb-readline', '~> 0.5.3'
+  s.add_runtime_dependency 'rexml'
 
   s.add_runtime_dependency 'hocon', '~> 1.0'
   s.add_runtime_dependency 'net-ssh', '>= 5.0'

data/docs/tutorials/creating_a_test_environment.md

@@ -70,6 +70,7 @@ The platform's format is `/^OSFAMILY-VERSION-ARCH.*$/` where `OSFAMILY` is one o
 * oracle
 * scientific
 * sles
+* opensuse
 * ubuntu
 * windows
 * solaris

data/lib/beaker/dsl/helpers/web_helpers.rb

@@ -107,12 +107,11 @@ module Beaker
           logger.notify "  and saving to #{dst}"
           logger.notify "  using command: #{wget_command}"
 
-          #in ruby 1.9+ we can upgrade this to popen3 to gain access to the subprocess pid
-          result = `#{wget_command} 2>&1`
-          result.each_line do |line|
+          stdout_and_stderr_str, status = Open3.capture2e(wget_command)
+          stdout_and_stderr_str.each_line do |line|
             logger.debug(line)
           end
-          if $?.to_i != 0
+          unless status.success?
             raise "Failed to fetch_remote_dir '#{url}' (exit code #{$?})"
           end
           dst

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

@@ -138,7 +138,9 @@ module Unix::Exec
     if self['platform'].include?('solaris') || self['platform'].include?('osx')
       execute("ifconfig -a inet| awk '/broadcast/ {print $2}' | cut -d/ -f1 | head -1").strip
     else
-      execute("ip a | awk '/global/{print$2}' | cut -d/ -f1 | #{self['hypervisor'] == 'vagrant' ? 'tail' : 'head'} -1").strip
+
+      pipe_cmd = "#{self['hypervisor']}".include?('vagrant') ? 'tail' : 'head'
+      execute("ip a | awk '/global/{print$2}' | cut -d/ -f1 | #{pipe_cmd} -1").strip
     end
   end
 
@@ -186,8 +188,8 @@ module Unix::Exec
   # This is for sles based hosts.
   # @param [String] env_file The ssh environment file to read from
   def mirror_env_to_profile_d env_file
-    if self[:platform] =~ /sles-/
-      @logger.debug("mirroring environment to /etc/profile.d on sles platform host")
+    if self[:platform] =~ /opensuse|sles-/
+      @logger.debug("mirroring environment to /etc/profile.d on opensuse/sles platform host")
       cur_env = exec(Beaker::Command.new("cat #{env_file}")).stdout
       shell_env = ''
       cur_env.each_line do |env_line|
@@ -282,7 +284,7 @@ module Unix::Exec
       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/
+    when /opensuse|sles/
       exec(Beaker::Command.new("/usr/sbin/rcsshd restart"))
     when /solaris/
       exec(Beaker::Command.new("svcadm restart svc:/network/ssh:default"))
@@ -313,7 +315,7 @@ module Unix::Exec
       directory = tmpdir()
       exec(Beaker::Command.new("echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"))
       exec(Beaker::Command.new("mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"))
-    when /sles/
+    when /opensuse|sles/
       directory = tmpdir()
       exec(Beaker::Command.new("echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"))
       exec(Beaker::Command.new("mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"))

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

@@ -90,7 +90,7 @@ module Unix::File
     case self['platform']
     when /fedora|el-|redhat|centos/
       '/etc/yum.repos.d/'
-    when /sles/
+    when /opensuse|sles/
       '/etc/zypp/repos.d/'
     when /debian|ubuntu|cumulus|huaweios/
       '/etc/apt/sources.list.d'
@@ -113,7 +113,7 @@ module Unix::File
     repo_filename = "pl-%s-%s-" % [ package_name, build_version ]
 
     case variant
-    when /fedora|el|redhat|centos|cisco_nexus|cisco_ios_xr|sles/
+    when /fedora|el|redhat|centos|cisco_nexus|cisco_ios_xr|opensuse|sles/
       variant = 'el' if ['centos', 'redhat'].include?(variant)
 
       variant = 'redhatfips' if self['packaging_platform'] =~ /redhatfips/
@@ -154,7 +154,7 @@ module Unix::File
   # @return [String] Type of repo (rpm|deb)
   def repo_type
     case self['platform']
-    when /fedora|el-|redhat|centos|sles/
+    when /fedora|el-|redhat|centos|opensuse|sles/
       'rpm'
     when /debian|ubuntu|cumulus|huaweios/
       'deb'

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

@@ -28,7 +28,7 @@ module Unix::Pkg
       when /sles-10/
         result = execute("zypper se -i --match-exact #{name}", opts) { |result| result }
         result.stdout =~ /No packages found/ ? (return false) : (return result.exit_code == 0)
-      when /sles-/
+      when /opensuse|sles-/
         if !self[:sles_rpmkeys_nightly_pl_imported]
           # The `:sles_rpmkeys_nightly_pl_imported` key is only read here at this
           # time. It's just to make sure that we only do the key import once, &
@@ -85,7 +85,7 @@ module Unix::Pkg
 
   def install_package(name, cmdline_args = '', version = nil, opts = {})
     case self['platform']
-      when /sles-/
+      when /opensuse|sles-/
         execute("zypper --non-interactive --gpg-auto-import-keys in #{name}", opts)
       when /el-4/
         @logger.debug("Package installation not supported on rhel4")
@@ -177,7 +177,7 @@ module Unix::Pkg
 
   def uninstall_package(name, cmdline_args = '', opts = {})
     case self['platform']
-      when /sles-/
+      when /opensuse|sles-/
         execute("zypper --non-interactive rm #{name}", opts)
       when /el-4/
         @logger.debug("Package uninstallation not supported on rhel4")
@@ -207,7 +207,7 @@ module Unix::Pkg
   #                               the package manager
   def upgrade_package(name, cmdline_args = '', opts = {})
     case self['platform']
-      when /sles-/
+      when /opensuse|sles-/
         execute("zypper --non-interactive --no-gpg-checks up #{name}", opts)
       when /el-4/
         @logger.debug("Package upgrade is not supported on rhel4")
@@ -302,7 +302,7 @@ module Unix::Pkg
         deploy_yum_repo(path, name, version)
       when /ubuntu|debian|cumulus|huaweios/
         deploy_apt_repo(path, name, version)
-      when /sles/
+      when /opensuse|sles/
         deploy_zyp_repo(path, name, version)
       else
         # solaris, windows
@@ -424,12 +424,15 @@ module Unix::Pkg
     raise ArgumentError, error_message % "puppet_agent_version" unless puppet_agent_version
 
     variant, version, arch, codename = self['platform'].to_array
+
     case variant
     when /^(solaris)$/
       release_path_end, release_file = solaris_puppet_agent_dev_package_info(
         puppet_collection, puppet_agent_version, opts )
-    when /^(sles|aix|el|centos|oracle|redhat|scientific)$/
+    when /^(opensuse|sles|aix|el|centos|oracle|redhat|scientific)$/
       variant = 'el' if variant.match(/(?:el|centos|oracle|redhat|scientific)/)
+      variant = 'sles' if variant == 'opensuse'
+
       if variant == 'aix'
         arch = 'ppc' if arch == 'power'
         version_x, version_y = /^(\d+)\.(\d+)/.match(puppet_agent_version).captures.map(&:to_i)
@@ -464,7 +467,7 @@ module Unix::Pkg
 
     variant, version, arch, codename = self['platform'].to_array
     case variant
-    when /^(fedora|el|centos|redhat|sles)$/
+    when /^(fedora|el|centos|redhat|opensuse|sles)$/
       variant = ((['centos', 'redhat'].include?(variant)) ? 'el' : variant)
       release_file = "/repos/#{variant}/#{version}/#{puppet_collection}/#{arch}/puppet-agent-*.rpm"
       download_file = "puppet-agent-#{variant}-#{version}-#{arch}.tar.gz"
@@ -524,9 +527,9 @@ module Unix::Pkg
     case variant
     when /^(fedora|el|redhat|centos)$/
       command_name = 'yum'
-      command_name = 'dnf' if variant == 'fedora' && version > 21
+      command_name = 'dnf' if variant == 'fedora' && version.to_i > 21
       execute("#{command_name} --nogpgcheck localinstall -y #{onhost_package_file}")
-    when /^(sles)$/
+    when /^(opensuse|sles)$/
       execute("zypper --non-interactive --no-gpg-checks in #{onhost_package_file}")
     when /^(debian|ubuntu|cumulus)$/
       execute("dpkg -i --force-all #{onhost_package_file}")
@@ -552,7 +555,7 @@ module Unix::Pkg
   def uncompress_local_tarball(onhost_tar_file, onhost_base_dir, download_file)
     variant, version, arch, codename = self['platform'].to_array
     case variant
-    when /^(fedora|el|centos|redhat|sles|debian|ubuntu|cumulus)$/
+    when /^(fedora|el|centos|redhat|opensuse|sles|debian|ubuntu|cumulus)$/
       execute("tar -zxvf #{onhost_tar_file} -C #{onhost_base_dir}")
     when /^solaris$/
       # uncompress PE puppet-agent tarball

data/lib/beaker/host_prebuilt_steps.rb

@@ -13,6 +13,7 @@ module Beaker
     SLEEPWAIT = 5
     TRIES = 5
     RHEL8_PACKAGES = ['curl', 'chrony']
+    FEDORA_PACKAGES = ['curl', 'chrony']
     UNIX_PACKAGES = ['curl', 'ntpdate']
     FREEBSD_PACKAGES = ['curl', 'perl5|perl']
     OPENBSD_PACKAGES = ['curl']
@@ -52,9 +53,9 @@ module Beaker
           logger.notify "NTP date succeeded on #{host}"
         else
           case
-          when host['platform'] =~ /el-8/
+          when host['platform'] =~ /el-8|fedora/
             ntp_command = "chronyc add server #{ntp_server} prefer trust;chronyc makestep;chronyc burst 1/2"
-          when host['platform'] =~ /sles-/
+          when host['platform'] =~ /opensuse-|sles-/
             ntp_command = "sntp #{ntp_server}"
           when host['platform'] =~ /cisco_nexus/
             ntp_server = host.exec(Command.new("getent hosts #{NTPSERVER} | head -n1 |cut -d \" \" -f1"), :acceptable_exit_codes => [0]).stdout
@@ -105,7 +106,7 @@ module Beaker
           check_and_install_packages_if_needed(host, RHEL8_PACKAGES)
         when host['platform'] =~ /sles-10/
           check_and_install_packages_if_needed(host, SLES10_PACKAGES)
-        when host['platform'] =~ /sles-/
+        when host['platform'] =~ /opensuse|sles-/
           check_and_install_packages_if_needed(host, SLES_PACKAGES)
         when host['platform'] =~ /debian/
           check_and_install_packages_if_needed(host, DEBIAN_PACKAGES)
@@ -126,7 +127,9 @@ module Beaker
           check_and_install_packages_if_needed(host, SOLARIS11_PACKAGES)
         when host['platform'] =~ /archlinux/
           check_and_install_packages_if_needed(host, ARCHLINUX_PACKAGES)
-        when host['platform'] !~ /debian|aix|solaris|windows|sles-|osx-|cumulus|f5-|netscaler|cisco_/
+        when host['platform'] =~ /fedora/
+          check_and_install_packages_if_needed(host, FEDORA_PACKAGES)
+        when host['platform'] !~ /debian|aix|solaris|windows|opensuse-|sles-|osx-|cumulus|f5-|netscaler|cisco_/
           check_and_install_packages_if_needed(host, UNIX_PACKAGES)
         end
       end

data/lib/beaker/local_connection.rb

@@ -53,9 +53,12 @@ module Beaker
           result.stdout << std_out
           result.stderr << std_err
           result.exit_code = status.exitstatus
+          @logger.info(result.stdout) unless result.stdout.empty?
+          @logger.info(result.stderr) unless result.stderr.empty?
         end
       rescue => e
         result.stderr << e.inspect
+        @logger.info(result.stderr)
         result.exit_code = 1
       end
 

data/lib/beaker/perf.rb

@@ -4,7 +4,7 @@ module Beaker
 
     PERF_PACKAGES = ['sysstat']
     # SLES does not treat sysstat as a service that can be started
-    PERF_SUPPORTED_PLATFORMS = /debian|ubuntu|redhat|centos|oracle|scientific|fedora|el|eos|cumulus|sles/
+    PERF_SUPPORTED_PLATFORMS = /debian|ubuntu|redhat|centos|oracle|scientific|fedora|el|eos|cumulus|opensuse|sles/
     PERF_START_PLATFORMS     = /debian|ubuntu|redhat|centos|oracle|scientific|fedora|el|eos|cumulus/
 
     # Create the Perf instance and runs setup_perf_on_host on all hosts if --collect-perf-data
@@ -42,7 +42,7 @@ module Beaker
       if host['platform'] =~ /debian|ubuntu|cumulus/
         @logger.perf_output("Modify /etc/default/sysstat on Debian and Ubuntu platforms")
         host.exec(Command.new('sed -i s/ENABLED=\"false\"/ENABLED=\"true\"/ /etc/default/sysstat'))
-      elsif host['platform'] =~ /sles/
+      elsif host['platform'] =~ /opensuse|sles/
         @logger.perf_output("Creating symlink from /etc/sysstat/sysstat.cron to /etc/cron.d")
         host.exec(Command.new('ln -s /etc/sysstat/sysstat.cron /etc/cron.d'),:acceptable_exit_codes => [0,1])
       end

data/lib/beaker/platform.rb

@@ -3,14 +3,15 @@ module Beaker
   # all String methods while adding several platform-specific use cases.
   class Platform < String
     # Supported platforms
-    PLATFORMS = /^(alpine|huaweios|cisco_nexus|cisco_ios_xr|(free|open)bsd|osx|centos|fedora|debian|oracle|redhat|redhatfips|scientific|sles|ubuntu|windows|solaris|aix|archlinux|el|eos|cumulus|f5|netscaler)\-.+\-.+$/
+    PLATFORMS = /^(alpine|huaweios|cisco_nexus|cisco_ios_xr|(free|open)bsd|osx|centos|fedora|debian|oracle|redhat|redhatfips|scientific|opensuse|sles|ubuntu|windows|solaris|aix|archlinux|el|eos|cumulus|f5|netscaler)\-.+\-.+$/
     # Platform version numbers vs. codenames conversion hash
     PLATFORM_VERSION_CODES =
-      { :debian => { "buster"  => "10",
-                     "stretch" => "9",
-                     "jessie"  => "8",
-                     "wheezy"  => "7",
-                     "squeeze" => "6",
+      { :debian => { "bullseye"  => "11",
+                     "buster"    => "10",
+                     "stretch"   => "9",
+                     "jessie"    => "8",
+                     "wheezy"    => "7",
+                     "squeeze"   => "6",
                    },
         :ubuntu => { "focal"   => "2004",
                      "eoan"    => "1910",
@@ -68,6 +69,7 @@ module Beaker
     # * redhat
     # * redhatfips
     # * scientific
+    # * opensuse
     # * sles
     # * ubuntu
     # * windows

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '4.28.1'
+    STRING = '4.31.0'
   end
 end

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

@@ -89,6 +89,7 @@ describe ClassMixedWithDSLHelpers do
   describe "#fetch_http_dir" do
     let( :logger) { double("Beaker::Logger", :notify => nil , :debug => nil ) }
     let( :result) { double(:each_line => []) }
+    let( :status) { double('Process::Status', success?: true) }
 
     before do
       fetch_allows
@@ -97,8 +98,7 @@ describe ClassMixedWithDSLHelpers do
     describe "given valid arguments" do
 
       it "returns basename of first argument concatenated to second." do
-        expect(subject).to receive(:`).with(/^wget.*/).ordered { result }
-        expect($?).to receive(:to_i).and_return(0)
+        expect(Open3).to receive(:capture2e).with(/^wget.*/).ordered { result }.and_return(['', status])
         result = subject.fetch_http_dir "#{url}/beep", destdir
         expect(result).to eq("#{destdir}/beep")
       end

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

@@ -76,6 +76,11 @@ module Beaker
         expect( instance.package_config_dir ).to be === '/etc/zypp/repos.d/'
       end
 
+      it 'returns correctly for opensuse-based platforms' do
+        @platform = 'opensuse-15-x86_64'
+        expect( instance.package_config_dir ).to be === '/etc/zypp/repos.d/'
+      end
+
       it 'errors for all other platform types' do
         @platform = 'eos-4-x86_64'
         expect {
@@ -102,6 +107,13 @@ module Beaker
         expect( filename ).to match( /sion7\-sles\-/ )
       end
 
+      it 'sets the opensuse portion correctly for opensuse platforms' do
+        @platform = 'opensuse-15-x86_64'
+        allow( instance ).to receive( :is_pe? ) { false }
+        filename = instance.repo_filename( 'pkg_name', 'pkg_version7' )
+        expect( filename ).to match( /sion7\-opensuse\-/ )
+      end
+
       it 'builds the filename correctly for el-based platforms' do
         @platform = 'el-21-x86_64'
         allow( instance ).to receive( :is_pe? ) { false }

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

@@ -73,6 +73,13 @@ module Beaker
           instance.deploy_package_repo(path,name,version)
         end
 
+        it 'calls #deploy_zyp_repo for opensuse systems' do
+          @opts = {'platform' => 'opensuse-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)
@@ -102,6 +109,14 @@ module Beaker
         expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0})).exactly(2).times
         expect( instance.check_for_package(pkg) ).to be === true
       end
+      it "checks correctly on opensuse" do
+        @opts = {'platform' => 'opensuse-is-me'}
+        pkg = 'sles_package'
+        expect( Beaker::Command ).to receive( :new ).with( /^rpmkeys.*nightlies.puppetlabs.com.*/, anything, anything ).and_return('').ordered.once
+        expect( Beaker::Command ).to receive(:new).with("zypper --gpg-auto-import-keys se -i --match-exact #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('').ordered.once
+        expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0})).exactly(2).times
+        expect( instance.check_for_package(pkg) ).to be === true
+      end
 
       it "checks correctly on fedora" do
         @opts = {'platform' => 'fedora-is-me'}
@@ -297,6 +312,7 @@ module Beaker
         platforms = { 'solaris-10-x86_64' => ["solaris/10/#{puppet_collection}", "puppet-agent-#{puppet_agent_version}-1.i386.pkg.gz"],
                       'solaris-11-x86_64' => ["solaris/11/#{puppet_collection}", "puppet-agent@#{puppet_agent_version},5.11-1.i386.p5p"],
                       'sles-11-x86_64' => ["sles/11/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.sles11.x86_64.rpm"],
+                      'opensuse-15-x86_64' => ["sles/15/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.sles15.x86_64.rpm"],
                       'aix-6.1-power' => ["aix/6.1/#{puppet_collection}/ppc", "puppet-agent-#{puppet_agent_version}-1.aix6.1.ppc.rpm"],
                       'el-7-x86_64' => ["el/7/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.el7.x86_64.rpm"],
                       'centos-7-x86_64' => ["el/7/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.el7.x86_64.rpm"],
@@ -509,14 +525,9 @@ module Beaker
     describe '#install_local_package' do
       let( :platform      ) { @platform || 'fedora' }
       let( :version       ) { @version  || 6        }
-      let( :platform_mock ) {
-        mock = Object.new
-        allow( mock ).to receive( :to_array ) { [platform, version, '', ''] }
-        mock
-      }
 
       before :each do
-        allow( instance ).to receive( :[] ).with( 'platform' ) { platform_mock }
+        allow( instance ).to receive( :[] ).with( 'platform' ) { Beaker::Platform.new("#{platform}-#{version}-x86_64") }
       end
 
       it 'Fedora 22-39: uses dnf' do
@@ -530,7 +541,6 @@ module Beaker
 
       it 'Fedora 21 uses yum' do
         package_file = 'testing_456.yay'
-        platform_mock = Object.new
         [21].each do |version|
           @version = version
           expect( instance ).to receive( :execute ).with( /^yum.*#{package_file}$/ )
@@ -578,18 +588,13 @@ module Beaker
       let( :tar_file      ) { 'test.tar.gz'         }
       let( :base_dir      ) { '/base/dir/fake'      }
       let( :download_file ) { 'download_file.txt'   }
-      let( :platform_mock ) {
-        mock = Object.new
-        allow( mock ).to receive( :to_array ) { [platform, version, '', ''] }
-        mock
-      }
 
       before :each do
-        allow( instance ).to receive( :[] ).with( 'platform' ) { platform_mock }
+        allow( instance ).to receive( :[] ).with( 'platform' ) {  Beaker::Platform.new("#{platform}-#{version}-x86_64")  }
       end
 
       it 'rejects unsupported platforms' do
-        @platform = 'huawei'
+        @platform = 'cisco_nexus'
         expect {
           instance.uncompress_local_tarball( tar_file, base_dir, download_file )
         }.to raise_error(
@@ -605,6 +610,14 @@ module Beaker
         instance.uncompress_local_tarball( tar_file, base_dir, download_file )
       end
 
+      it 'untars the file given' do
+        @platform = 'opensuse'
+        expect( instance ).to receive( :execute ).with(
+          /^tar .* #{tar_file} .* #{base_dir}$/
+        )
+        instance.uncompress_local_tarball( tar_file, base_dir, download_file )
+      end
+
       context 'on solaris' do
 
         before :each do

data/spec/beaker/host/unix_spec.rb

@@ -170,6 +170,14 @@ module Unix
         expect( release_file ).to be === "puppet-agent-pa_version1-1.sles12.arch.rpm"
       end
 
+      it 'sets up opensuse platforms correctly' do
+        @platform = 'opensuse-15-x86_64'
+        release_path_end, release_file = host.puppet_agent_dev_package_info(
+          'pa_collection', 'pa_version1' )
+        expect( release_path_end ).to be === "sles/15/pa_collection/x86_64"
+        expect( release_file ).to be === "puppet-agent-pa_version1-1.sles15.x86_64.rpm"
+      end
+
       it 'sets the arch correctly on aix-power platforms' do
         @platform = 'aix-6.1-power'
         release_path_end, release_file = host.puppet_agent_dev_package_info(
@@ -234,4 +242,4 @@ module Unix
       end
     end
   end
-end
+end