beaker 3.18.0 → 3.19.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWRlZjc1Y2Y2YTk4YjdmZjBjMWE4OGYxNWQ0YzFjNjllYjRmNGI2NQ==
+    NmYyZWQyNGMxMzRkNDZlOWZlODBiYWU4YTBmZmY2YzgzNGI0ODI5NA==
   data.tar.gz: !binary |-
-    ZjQ4ZjYxNTFkZGU4NjVhMzBjOGRhYzc1NTM1NWNhYzE2YTA2NzkxZA==
+    Nzk2Njc3NDM0YmNhODliNTM5NjllZjUxMmM5NzRmZTAyMDc0OTMyOA==
 SHA512:
   metadata.gz: !binary |-
-    MDVjMzVlYjg2MjYyYjM5NjUwYzQ4ZmVhYjk1NDY4MDJlZWQ5YTYzOTZlM2Ey
-    MTM0NDFmNDRjODhkN2RkOTBlMGFmNGJkMGIzY2RmYmZhZDY1NDVjZGVkNjg0
-    YmI5ODIzOTRmMTE1MmRlYjNhZmM1MGRkMjZkNzIzZTYyMTRjMDM=
+    OTcwOWRlZDhkODc1YzBlNjNlZWVjNGI1MjA1YmRhNmUxNjZmMWMxZGQ0OGM2
+    NTM2NjdlMjZhYTVkZDQyNzcxMDQxMmFmZDM1YzgyZjk4MDE5MGJhNGY4MWVl
+    NjU2YTY2Mzk2OWJmYmJiMzQxMDdmYWJiZGQ2MzIyZGFkNzJhNTc=
   data.tar.gz: !binary |-
-    YTc4ZDBkYjYzM2E1NGYzZWVjMWQ4ZjRiMWVhMzhjZDlhYjYwNzY2ODhiMjli
-    MzA3MGYxNjVlOTk5NDllMWM3ZjI3YzVhMTFhODM1ODAxYzAwYjUxMzI0YTcx
-    OTU4Y2U3NTFlNWIyZWE2M2EzNDJhZmZiODg1NjZiNTY4MjZjYzg=
+    OGUwMDhjMjViM2Y4ZTM2YjM3ZmM4MzRmOWFmYTk1YWE2ZDk5YzQ0ZjcxM2E1
+    YjE4MDYxZGE4NmQyZTFiY2MxMTc5Y2UxOTdjYTE1YTFkNTMzNDEyMGExNmU2
+    MDcwNTE4NTQzY2QxNjEzYTg3MDU5Zjg3YjU4NTI0YzA5NjRjZWM=

data/Rakefile

@@ -200,29 +200,6 @@ Run the puppet beaker acceptance tests on a pe install.
     beaker_test(:puppetpe)
   end
 
-  desc <<-EOS
-Run the puppet beaker acceptance tests on a puppet gem install.
-#{USAGE}
-  EOS
-  task :puppetgem  => 'gen_hosts' do
-    beaker_test(:puppetgem)
-  end
-
-  desc <<-EOS
-Run the puppet beaker acceptance tests on a puppet git install.
-#{USAGE}
-  EOS
-  task :puppetgit  => 'gen_hosts' do
-    beaker_test(:puppetgit)
-  end
-
-  desc <<-EOS
-Run the puppet beaker acceptance tests on a puppet package install.
-#{USAGE}
-  EOS
-  task :puppetpkg => 'gen_hosts' do
-    beaker_test(:puppetpkg)
-  end
 
   desc 'Generate Beaker Host Config File'
   task :gen_hosts do

data/beaker.gemspec

@@ -48,6 +48,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'stringify-hash', '~> 0.0'
   s.add_runtime_dependency 'beaker-hiera', '~> 0.0'
   s.add_runtime_dependency 'beaker-hostgenerator'
+  s.add_runtime_dependency 'beaker-puppet', '~> 0.0'
 
   # Optional provisioner specific support
   s.add_runtime_dependency 'rbvmomi', '~> 1.9'

data/lib/beaker/dsl/helpers.rb

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
-[ 'facter', 'host', 'puppet', 'test', 'tk', 'web', 'hocon' ].each do |lib|
+[ 'host', 'test', 'web', 'hocon' ].each do |lib|
       require "beaker/dsl/helpers/#{lib}_helpers"
 end
 
 require "beaker-hiera"
+require 'beaker-puppet'
 module Beaker
   module DSL
 
@@ -23,14 +24,12 @@ module Beaker
     #
     #
     module Helpers
-      include Beaker::DSL::Helpers::FacterHelpers
       include Beaker::DSL::Helpers::HostHelpers
-      include Beaker::DSL::Helpers::PuppetHelpers
       include Beaker::DSL::Helpers::TestHelpers
-      include Beaker::DSL::Helpers::TKHelpers
       include Beaker::DSL::Helpers::WebHelpers
       include Beaker::DSL::Helpers::HoconHelpers
       include Beaker::DSL::Helpers::Hiera
+      include BeakerPuppet::Helpers
     end
   end
 end

data/lib/beaker/dsl/install_utils.rb

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

data/lib/beaker/dsl/wrappers.rb

@@ -9,39 +9,6 @@ module Beaker
     # many of them.
     module Wrappers
 
-      # This is hairy and because of legacy code it will take a bit more
-      # work to disentangle all of the things that are being passed into
-      # this catchall param.
-      #
-      def facter(*args)
-        options = args.last.is_a?(Hash) ? args.pop : {}
-        options['ENV'] ||= {}
-        options[:cmdexe] = true
-        Command.new('facter', args, options )
-      end
-
-      # This is hairy and because of legacy code it will take a bit more
-      # work to disentangle all of the things that are being passed into
-      # this catchall param.
-      #
-      def cfacter(*args)
-        options = args.last.is_a?(Hash) ? args.pop : {}
-        options['ENV'] ||= {}
-        options[:cmdexe] = true
-        Command.new('cfacter', args, options )
-      end
-
-      # This is hairy and because of legacy code it will take a bit more
-      # work to disentangle all of the things that are being passed into
-      # this catchall param.
-      #
-      def hiera(*args)
-        options = args.last.is_a?(Hash) ? args.pop : {}
-        options['ENV'] ||= {}
-        options[:cmdexe] = true
-        Command.new('hiera', args, options )
-      end
-
       # @param [String] command_string A string of to be interpolated
       #                                within the context of a host in
       #                                question
@@ -51,60 +18,6 @@ module Beaker
         HostCommand.new(command_string)
       end
 
-      # This is hairy and because of legacy code it will take a bit more
-      # work to disentangle all of the things that are being passed into
-      # this catchall param.
-      #
-      def puppet(*args)
-        options = args.last.is_a?(Hash) ? args.pop : {}
-        options['ENV'] ||= {}
-        options[:cmdexe] = true
-        # we assume that an invocation with `puppet()` will have it's first argument
-        # a face or sub command
-        cmd = "puppet #{args.shift}"
-        Command.new( cmd, args, options )
-      end
-
-      # @!visibility private
-      def puppet_resource(*args)
-        puppet( 'resource', *args )
-      end
-
-      # @!visibility private
-      def puppet_doc(*args)
-        puppet( 'doc', *args )
-      end
-
-      # @!visibility private
-      def puppet_kick(*args)
-        puppet( 'kick', *args )
-      end
-
-      # @!visibility private
-      def puppet_cert(*args)
-        puppet( 'cert', *args )
-      end
-
-      # @!visibility private
-      def puppet_apply(*args)
-        puppet( 'apply', *args )
-      end
-
-      # @!visibility private
-      def puppet_master(*args)
-        puppet( 'master', *args )
-      end
-
-      # @!visibility private
-      def puppet_agent(*args)
-        puppet( 'agent', *args )
-      end
-
-      # @!visibility private
-      def puppet_filebucket(*args)
-        puppet( 'filebucket', *args )
-      end
-
       # Returns a {Beaker::Command} object for executing powershell commands on a host
       #
       # @param [String]   command   The powershell command to execute

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

@@ -471,40 +471,79 @@ module Unix::Pkg
   def pe_puppet_agent_promoted_package_install(
     onhost_copy_base, onhost_copied_download, onhost_copied_file, download_file, opts
   )
+    uncompress_local_tarball( onhost_copied_download, onhost_copy_base, download_file )
+    if self['platform'] =~ /^solaris/
+      # above uncompresses the install from .tar.gz -> .p5p into the
+      # onhost_copied_file directory w/a weird name. We have to read that file
+      # name from the filesystem, so that we can provide it to install_local...
+      pkg_filename = execute( "ls #{onhost_copied_file}" )
+      onhost_copied_file = "#{onhost_copied_file}#{pkg_filename}"
+    end
+
+    install_local_package( onhost_copied_file, onhost_copy_base )
+    nil
+  end
+
+  # Installs a package already located on a SUT
+  #
+  # @param [String] onhost_package_file Path to the package file to install
+  # @param [String] onhost_copy_dir Path to the directory where the package
+  #                                 file is located. Used on solaris only
+  #
+  # @return nil
+  def install_local_package(onhost_package_file, onhost_copy_dir = nil)
     variant, version, arch, codename = self['platform'].to_array
     case variant
-    when /^(fedora-(2[2-9]))$/
-      execute("tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}")
-      execute("dnf --nogpgcheck localinstall -y #{onhost_copied_file}")
     when /^(fedora|el|centos)$/
-      execute("tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}")
-      execute("yum --nogpgcheck localinstall -y #{onhost_copied_file}")
+      command_name = 'yum'
+      command_name = 'dnf 'if variant == 'fedora' && version > 21 && version <= 29
+      execute("#{command_name} --nogpgcheck localinstall -y #{onhost_package_file}")
     when /^(sles)$/
-      execute("tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}")
-      execute("rpm -ihv #{onhost_copied_file}")
+      execute("rpm -ihv #{onhost_package_file}")
     when /^(debian|ubuntu|cumulus)$/
-      execute("tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}")
-      execute("dpkg -i --force-all #{onhost_copied_file}")
+      execute("dpkg -i --force-all #{onhost_package_file}")
       execute("apt-get update")
+    when /^solaris$/
+      self.solaris_install_local_package( onhost_package_file, onhost_copy_dir )
+    when /^osx$/
+      install_package( onhost_package_file )
+    else
+      msg = "Platform #{variant} is not supported by the method "
+      msg << 'install_local_package'
+      raise ArgumentError, msg
+    end
+  end
+
+  # Uncompresses a tarball on the SUT
+  #
+  # @param [String] onhost_tar_file Path to the tarball to uncompress
+  # @param [String] onhost_base_dir Path to the directory to uncompress to
+  # @param [String] download_file Name of the file after uncompressing
+  #
+  # @return nil
+  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|sles|debian|ubuntu|cumulus)$/
+      execute("tar -zxvf #{onhost_tar_file} -C #{onhost_base_dir}")
     when /^solaris$/
       # uncompress PE puppet-agent tarball
       if version == '10'
-        execute("gunzip #{onhost_copied_download}")
+        execute("gunzip #{onhost_tar_file}")
         tar_file_name = File.basename(download_file, '.gz')
         execute("tar -xvf #{tar_file_name}")
       elsif version == '11'
-        execute("tar -zxvf #{onhost_copied_download}")
+        execute("tar -zxvf #{onhost_tar_file}")
       else
         msg = "Solaris #{version} is not supported by the method "
-        msg << 'install_puppet_agent_pe_promoted_repo_on'
+        msg << 'uncompress_local_tarball'
         raise ArgumentError, msg
       end
-      # get uncompressed package filename on the system
-      pkg_filename = execute( "ls #{onhost_copied_file}" )
-      pkg_path = "#{onhost_copied_file}#{pkg_filename}"
-      self.solaris_install_local_package( pkg_path, onhost_copy_base )
+    else
+      msg = "Platform #{variant} is not supported by the method "
+      msg << 'uncompress_local_tarball'
+      raise ArgumentError, msg
     end
-    nil
   end
 
   # Installs a local package file on a solaris host

data/lib/beaker/hypervisor/docker.rb

@@ -5,6 +5,7 @@ module Beaker
     # Env variables supported:
     # DOCKER_REGISTRY: Docker registry URL
     # DOCKER_HOST: Remote docker host
+    # DOCKER_BUILDARGS: Docker buildargs map
     # @param [Host, Array<Host>, String, Symbol] hosts    One or more hosts to act upon,
     #                            or a role (String or Symbol) that identifies one or more hosts.
     # @param [Hash{Symbol=>String}] options Options to pass on to the hypervisor
@@ -50,7 +51,9 @@ module Beaker
         @logger.notify "provisioning #{host.name}"
 
         @logger.debug("Creating image")
-        image = ::Docker::Image.build(dockerfile_for(host), { :rm => true })
+        image = ::Docker::Image.build(dockerfile_for(host), {
+           :rm => true, :buildargs => buildargs_for(host)
+        })
 
         if @docker_type == 'swarm'
           image_name = "#{@registry}/beaker/#{image.id}"
@@ -178,6 +181,28 @@ module Beaker
       'root'
     end
 
+    def buildargs_for(host)
+      docker_buildargs = {}
+      docker_buildargs_env = ENV['DOCKER_BUILDARGS']
+      if docker_buildargs_env != nil
+        docker_buildargs_env.split(/ +|\t+/).each do |arg|
+          key,value=arg.split(/=/)
+          if key
+            docker_buildargs[key]=value
+          else
+            @logger.warn("DOCKER_BUILDARGS environment variable appears invalid, no key found for value #{value}" )
+          end
+        end
+      end
+      if docker_buildargs.empty?
+        buildargs = host['docker_buildargs'] || {}
+      else
+        buildargs = docker_buildargs
+      end
+      @logger.debug("Docker build buildargs: #{buildargs}")
+      JSON.generate(buildargs)
+    end
+
     def dockerfile_for(host)
       if host['dockerfile'] then
         @logger.debug("attempting to load user Dockerfile from #{host['dockerfile']}")

data/lib/beaker/options/parser.rb

@@ -205,7 +205,8 @@ module Beaker
       #   3.  the 'CONFIG' section of the hosts file
       #   4.  options file values
       #   5.  subcommand options, if executing beaker subcommands
-      #   6.  default or preset values are given the lowest priority
+      #   6.  subcommand options from $HOME/.beaker/subcommand_options.yaml
+      #   7.  default or preset values are given the lowest priority
       #
       # @param [Array] args ARGV or a provided arguments array
       # @raise [ArgumentError] Raises error on bad input
@@ -216,10 +217,16 @@ module Beaker
         cmd_line_options[:command_line] = ([$0] + args).join(' ')
         @attribution = @attribution.merge(tag_sources(cmd_line_options, "flag"))
 
-        # Subcommands are the first to get merged into presets
-        subcommand_options = Beaker::Options::SubcommandOptionsParser.parse_subcommand_options(args)
-        @attribution = @attribution.merge(tag_sources(subcommand_options, 'subcommand'))
-        @options.merge!(subcommand_options)
+        subcommand_options_file = Beaker::Subcommands::SubcommandUtil::SUBCOMMAND_OPTIONS
+        options_files = {"homedir" => "#{ENV['HOME']}/#{subcommand_options_file}", "subcommand" => subcommand_options_file}
+
+        # Global subcommand options from $HOME/.beaker/subcommand_options.yaml are first to get merged into presets
+        # Subcommands are the second to get merged into presets
+        options_files.each do |src, path|
+          opts = Beaker::Options::SubcommandOptionsParser.parse_subcommand_options(args, path)
+          @attribution = @attribution.merge(tag_sources(opts, src))
+          @options.merge!(opts)
+        end
 
         file_options                    = Beaker::Options::OptionsFileParser.parse_options_file(cmd_line_options[:options_file])
         @attribution = @attribution.merge(tag_sources(file_options, "options_file"))

data/lib/beaker/options/subcommand_options_file_parser.rb

@@ -3,18 +3,25 @@ module Beaker
     #A set of functions to read options files
     module SubcommandOptionsParser
 
+      def self.parse_options_file(options_file_path)
+        result = OptionsHash.new
+        if File.exist?(options_file_path)
+          result = YAML.load_file(options_file_path)
+        end
+        result
+      end
+
       # @return [OptionsHash, Hash] returns an empty OptionHash or loads subcommand options yaml
       #   from disk
-      def self.parse_subcommand_options(argv)
+      def self.parse_subcommand_options(argv, options_file)
         result = OptionsHash.new
         if Beaker::Subcommands::SubcommandUtil.execute_subcommand?(argv[0])
           return result if argv[0] == 'init'
-          if Beaker::Subcommands::SubcommandUtil::SUBCOMMAND_OPTIONS.exist?
-           result = YAML.load_file(Beaker::Subcommands::SubcommandUtil::SUBCOMMAND_OPTIONS)
-          end
+          result = SubcommandOptionsParser.parse_options_file(options_file)
         end
         result
       end
+
     end
   end
 end

data/lib/beaker/ssh_connection.rb

@@ -65,16 +65,16 @@ module Beaker
 
     # connect to the host
     def connect
-      #try three ways to connect to host (ip, vmhostname, hostname)
+      #try three ways to connect to host (vmhostname, ip, hostname)
       methods = []
-      if @ip
-        @ssh ||= connect_block(@ip, @user, @ssh_opts)
-        methods << "ip (#{@ip})"
-      end
-      if @vmhostname && !@ssh
+      if @vmhostname
         @ssh ||= connect_block(@vmhostname, @user, @ssh_opts)
         methods << "vmhostname (#{@vmhostname})"
       end
+      if @ip && !@ssh
+        @ssh ||= connect_block(@ip, @user, @ssh_opts)
+        methods << "ip (#{@ip})"
+      end
       if @hostname && !@ssh
         @ssh ||= connect_block(@hostname, @user, @ssh_opts)
         methods << "hostname (#{@hostname})"

data/lib/beaker/subcommand.rb

@@ -52,6 +52,12 @@ module Beaker
     class_option :'exclude-tags', :type => :string, :group => 'Beaker run'
     class_option :'xml-time-order', :type => :boolean, :group => 'Beaker run'
 
+    # The following are listed as deprecated in beaker --help, but needed now for
+    # feature parity for beaker 3.x.
+    class_option :xml, :type => :boolean, :group => "Beaker run"
+    class_option :type, :type => :string, :group => "Beaker run"
+    class_option :debug, :type => :boolean, :group => "Beaker run"
+
     desc "init BEAKER_RUN_OPTIONS", "Initializes the required configuration for Beaker subcommand execution"
     long_desc <<-LONGDESC
       Initializes the required .beaker configuration folder. This folder contains