beaker 2.18.0 → 2.19.0

data/acceptance/lib/beaker/acceptance/install_utils.rb

@@ -0,0 +1,58 @@
+module Beaker
+  module Acceptance
+    module InstallUtils
+
+      PLATFORM_PATTERNS = {
+        :redhat        => /fedora|el|centos/,
+        :debian        => /debian|ubuntu/,
+        :debian_ruby18 => /debian|ubuntu-lucid|ubuntu-precise/,
+        :solaris_10    => /solaris-10/,
+        :solaris_11    => /solaris-11/,
+        :windows       => /windows/,
+        :sles          => /sles/,
+      }.freeze
+
+      # Installs packages on the hosts.
+      #
+      # @param hosts [Array<Host>] Array of hosts to install packages to.
+      # @param package_hash [Hash{Symbol=>Array<String,Array<String,String>>}]
+      #   Keys should be a symbol for a platform in PLATFORM_PATTERNS.  Values
+      #   should be an array of package names to install, or of two element
+      #   arrays where a[0] is the command we expect to find on the platform
+      #   and a[1] is the package name (when they are different).
+      # @param options [Hash{Symbol=>Boolean}]
+      # @option options [Boolean] :check_if_exists First check to see if
+      #   command is present before installing package.  (Default false)
+      # @return true
+      def install_packages_on(hosts, package_hash, options = {})
+        return true if hosts == nil
+        check_if_exists = options[:check_if_exists]
+        hosts = [hosts] unless hosts.kind_of?(Array)
+        hosts.each do |host|
+          package_hash.each do |platform_key,package_list|
+            if pattern = PLATFORM_PATTERNS[platform_key]
+              if pattern.match(host['platform'])
+                package_list.each do |cmd_pkg|
+                  if cmd_pkg.kind_of?(Array)
+                    command, package = cmd_pkg
+                  else
+                    command = package = cmd_pkg
+                  end
+                  if !check_if_exists || !host.check_for_package(command)
+                    host.logger.notify("Installing #{package}")
+                    additional_switches = '--allow-unauthenticated' if platform_key == :debian
+                    host.install_package(package, additional_switches)
+                  end
+                end
+              end
+            else
+              raise("Unknown platform '#{platform_key}' in package_hash")
+            end
+          end
+        end
+        return true
+      end
+
+    end
+  end
+end

data/acceptance/pre_suite/puppet_gem/install.rb

@@ -1,10 +1,3 @@
 hosts.each do |host|
   install_puppet_from_gem(host, {:version => '3.7.5'})
-
-  if host['platform'] =~ /sles/
-    host.mkdir_p(host['puppetbindir'])
-    ['facter', 'hiera', 'puppet'].each do |tool|
-      on host, "ln -s /usr/bin/#{tool}.ruby* #{host['puppetbindir']}/#{tool}"
-    end
-  end
-end
+end

data/acceptance/pre_suite/puppet_git/install.rb

@@ -1,3 +1,9 @@
+begin
+  require 'beaker/acceptance/install_utils'
+  extend Beaker::Acceptance::InstallUtils
+end
+test_name 'Puppet git pre-suite'
+
 install = [
   'facter#2.1.0',
   'hiera#1.3.4',
@@ -40,73 +46,8 @@ PACKAGES = {
   ]
 }
 
-PLATFORM_PATTERNS = {
-  :redhat        => /fedora|el|centos/,
-  :debian        => /debian|ubuntu/,
-  :debian_ruby18 => /debian|ubuntu-lucid|ubuntu-precise/,
-  :solaris_10    => /solaris-10/,
-  :solaris_11    => /solaris-11/,
-  :windows       => /windows/,
-  :sles          => /sles/,
-}.freeze
-
-# Installs packages on the hosts.
-#
-# @param hosts [Array<Host>] Array of hosts to install packages to.
-# @param package_hash [Hash{Symbol=>Array<String,Array<String,String>>}]
-#   Keys should be a symbol for a platform in PLATFORM_PATTERNS.  Values
-#   should be an array of package names to install, or of two element
-#   arrays where a[0] is the command we expect to find on the platform
-#   and a[1] is the package name (when they are different).
-# @param options [Hash{Symbol=>Boolean}]
-# @option options [Boolean] :check_if_exists First check to see if
-#   command is present before installing package.  (Default false)
-# @return true
-def install_packages_on(hosts, package_hash, options = {})
-  return true if hosts == nil
-  check_if_exists = options[:check_if_exists]
-  hosts = [hosts] unless hosts.kind_of?(Array)
-  hosts.each do |host|
-    package_hash.each do |platform_key,package_list|
-      if pattern = PLATFORM_PATTERNS[platform_key]
-        if pattern.match(host['platform'])
-          package_list.each do |cmd_pkg|
-            if cmd_pkg.kind_of?(Array)
-              command, package = cmd_pkg
-            else
-              command = package = cmd_pkg
-            end
-            if !check_if_exists || !host.check_for_package(command)
-              host.logger.notify("Installing #{package}")
-              additional_switches = '--allow-unauthenticated' if platform_key == :debian
-              host.install_package(package, additional_switches)
-            end
-          end
-        end
-      else
-        raise("Unknown platform '#{platform_key}' in package_hash")
-      end
-    end
-  end
-  return true
-end
-
 install_packages_on(hosts, PACKAGES, :check_if_exists => true)
 
-def lookup_in_env(env_variable_name, project_name, default)
-  project_specific_name = "#{project_name.upcase.gsub("-","_")}_#{env_variable_name}"
-  ENV[project_specific_name] || ENV[env_variable_name] || default
-end
-
-def build_giturl(project_name, git_fork = nil, git_server = nil)
-  git_fork ||= lookup_in_env('FORK', project_name, 'puppetlabs')
-  git_server ||= lookup_in_env('GIT_SERVER', project_name, 'github.com')
-  repo = (git_server == 'github.com') ?
-    "#{git_fork}/#{project_name}.git" :
-    "#{git_fork}-#{project_name}.git"
-  "git://#{git_server}/#{repo}"
-end
-
 hosts.each do |host|
   case host['platform']
   when /windows/

data/acceptance/pre_suite/puppet_pkg/install.rb

@@ -1,7 +1,7 @@
 # the version is required on windows
 # all versions are required for osx
 install_puppet({
-  :version        => '3.7.5',
+  :version        => '3.8.1',
   :facter_version => '2.1.0',
   :hiera_version  => '1.3.4',
 })

data/acceptance/tests/foss_utils/clone_git_repo_on.rb

@@ -0,0 +1,49 @@
+begin
+  require 'beaker/acceptance/install_utils'
+  extend Beaker::Acceptance::InstallUtils
+end
+test_name 'Clone from git'
+
+PACKAGES = {
+  :redhat => [
+    'git',
+  ],
+  :debian => [
+    ['git', 'git-core'],
+  ],
+  :solaris_11 => [
+    ['git', 'developer/versioning/git'],
+  ],
+  :solaris_10 => [
+    'coreutils',
+    'curl', # update curl to fix "CURLOPT_SSL_VERIFYHOST no longer supports 1 as value!" issue
+    'git',
+  ],
+  :windows => [
+    'git',
+  ],
+  :sles => [
+    'git-core',
+  ]
+}
+
+install_packages_on(hosts, PACKAGES, :check_if_exists => true)
+
+# build_giturl implicitly looks these up
+ENV['HIERA_FORK']='puppetlabs'
+ENV['FORK']='fail'
+
+# implicitly tests build_giturl() and lookup_in_env()
+hosts.each do |host|
+  on host, "echo #{GitHubSig} >> $HOME/.ssh/known_hosts"
+  testdir = create_tmpdir_on(host, File.basename(__FILE__))
+
+  step 'should find fork name from the correct environment variable'
+  results = clone_git_repo_on(host, "#{testdir}", extract_repo_info_from(build_git_url('puppet')))
+  assert_match( /github\.com:fail/, result.cmd, 'Did not find correct fork name')
+  assert_equal( 1, result.exit_code, 'Did not produce error exit_code of 1')
+
+  step 'should clone hiera from correct fork'
+  results = clone_git_repo_on(host, "#{testdir}", extract_repo_info_from(build_git_url('hiera')))
+  assert_match( /From github\.com:puppetlabs\/hiera/, result.output, 'Did not find clone')
+end

data/beaker.gemspec

@@ -39,6 +39,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'inifile', '~> 2.0'
   s.add_runtime_dependency 'rsync', '~> 1.0.9'
   s.add_runtime_dependency 'open_uri_redirections', '~> 0.2.1'
+  s.add_runtime_dependency 'beaker-answers', '~> 0.0'
+  s.add_runtime_dependency 'stringify-hash', '~> 0.0'
 
   # Optional provisioner specific support
   s.add_runtime_dependency 'rbvmomi', '~> 1.8'

data/lib/beaker/command.rb

@@ -197,7 +197,7 @@ module Beaker
     # @return a new {SedCommand} object
     def initialize platform, expression, filename, opts = {}
       command = "sed -i -e \"#{expression}\" #{filename}"
-      if platform =~ /solaris|aix|osx/
+      if platform =~ /solaris|aix|osx|openbsd/
         command.slice! '-i '
         temp_file = opts[:temp_file] ? opts[:temp_file] : "#{filename}.tmp"
         command << " > #{temp_file} && mv #{temp_file} #{filename} && rm -f #{temp_file}"

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

@@ -623,13 +623,15 @@ module Beaker
               end
             end
 
-            # The agent service is `pe-puppet` everywhere EXCEPT certain linux distros on PE 2.8
-            # In all the case that it is different, this init script will exist. So we can assume
-            # that if the script doesn't exist, we should just use `pe-puppet`
-            agent_service = 'pe-puppet-agent'
-            agent_service = 'pe-puppet' unless agent.file_exist?('/etc/init.d/pe-puppet-agent')
             # In 4.0 this was changed to just be `puppet`
-            agent_service = 'puppet' unless version_is_less(agent['pe_ver'], '4.0')
+            agent_service = 'puppet'
+            if !aio_version?(agent)
+              # The agent service is `pe-puppet` everywhere EXCEPT certain linux distros on PE 2.8
+              # In all the case that it is different, this init script will exist. So we can assume
+              # that if the script doesn't exist, we should just use `pe-puppet`
+              agent_service = 'pe-puppet-agent'
+              agent_service = 'pe-puppet' unless agent.file_exist?('/etc/init.d/pe-puppet-agent')
+            end
 
             # Under a number of stupid circumstances, we can't stop the
             # agent using puppet.  This is usually because of issues with

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

@@ -33,7 +33,7 @@ module Beaker
         #
         # @param [String] base_url The base url from which to recursively download
         #                          files.
-        # @param [String] file_name The trailing name compnent of both the source url
+        # @param [String] file_name The trailing name component of both the source url
         #                           and the destination file.
         # @param [String] dst_dir The local destination directory.
         #
@@ -44,6 +44,7 @@ module Beaker
           require 'open-uri'
           require 'open_uri_redirections'
           FileUtils.makedirs(dst_dir)
+          base_url.chomp!('/')
           src = "#{base_url}/#{file_name}"
           dst = File.join(dst_dir, file_name)
           if File.exists?(dst)

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

@@ -10,7 +10,6 @@ module Beaker
         #
         AIO_DEFAULTS = {
           'unix' => {
-            'puppetservice'         => 'pe-puppetserver',
             'puppetbindir'          => '/opt/puppetlabs/bin',
             'privatebindir'         => '/opt/puppetlabs/puppet/bin',
             'distmoduledir'         => '/etc/puppetlabs/code/modules',
@@ -37,7 +36,6 @@ module Beaker
           else
             host['group'] = 'puppet'
           end
-          host['type'] = 'aio'
         end
 
         # Add the appropriate aio defaults to an array of hosts
@@ -61,7 +59,6 @@ module Beaker
           AIO_DEFAULTS[platform].each_pair do |key, val|
             host.delete(key)
           end
-          host['type'] = nil
           host['group'] = nil
         end
 

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

@@ -34,6 +34,21 @@ module Beaker
             'distmoduledir'     => '/usr/local/etc/puppet/modules',
             'sitemoduledir'     => '/usr/share/puppet/modules',
           },
+          'openbsd' => {
+            'puppetserver-confdir' => '/etc/puppetserver/conf.d',
+            'puppetservice'     => 'puppetmaster',
+            'puppetpath'        => '/etc/puppet/modules',
+            'puppetvardir'      => '/var/puppet',
+            'puppetbin'         => '/usr/local/bin/puppet',
+            'puppetbindir'      => '/usr/local/bin',
+            'hieralibdir'       => '/opt/puppet-git-repos/hiera/lib',
+            'hierapuppetlibdir' => '/opt/puppet-git-repos/hiera-puppet/lib',
+            'hierabindir'       => '/opt/puppet-git-repos/hiera/bin',
+            'hieradatadir'      => '/etc/puppet/hieradata',
+            'hieraconf'         => '/etc/puppet/hiera.yaml',
+            'distmoduledir'     => '/etc/puppet/modules',
+            'sitemoduledir'     => '/usr/local/share/puppet/modules',
+          },
           'mac' => {
             'puppetserver-confdir' => '/etc/puppetserver/conf.d',
             'puppetservice'     => 'puppetmaster',
@@ -123,6 +138,8 @@ module Beaker
               platform = 'unix'
             when /freebsd/
               platform = 'freebsd'
+            when /openbsd/
+              platform = 'openbsd'
             when /mac/
               platform = 'mac'
             when /pswindows/
@@ -155,6 +172,8 @@ module Beaker
               platform = 'unix'
             when /freebsd/
               platform = 'freebsd'
+            when /openbsd/
+              platform = 'openbsd'
             when /mac/
               platform = 'mac'
             when /pswindows/