beaker 1.21.0 → 2.0.0

data/lib/beaker/dsl/install_utils.rb

@@ -129,7 +129,7 @@ module Beaker
           commands = ["cd #{target}",
                       "remote rm origin",
                       "remote add origin #{repo}",
-                      "fetch origin",
+                      "fetch origin +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/*:refs/remotes/origin/*",
                       "clean -fdx",
                       "checkout -f #{rev}"]
           on host, commands.join(" && git ")
@@ -169,23 +169,39 @@ module Beaker
           log_file = "#{File.basename(host['working_dir'])}.log"
           pe_debug = host[:pe_debug] || opts[:pe_debug] ? " && cat #{log_file}" : ''
           "cd #{host['working_dir']} && cmd /C 'start /w msiexec.exe /qn /L*V #{log_file} /i #{host['dist']}.msi PUPPET_MASTER_SERVER=#{master} PUPPET_AGENT_CERTNAME=#{host}'#{pe_debug}"
-        elsif host['platform'] =~ /osx/
-          version = host['pe_ver'] || opts[:pe_ver]
-          pe_debug = host[:pe_debug] || opts[:pe_debug] ? ' -verboseR' : ''
-          "cd #{host['working_dir']} && hdiutil attach #{host['dist']}.dmg && installer#{pe_debug} -pkg /Volumes/puppet-enterprise-#{version}/puppet-enterprise-installer-#{version}.pkg -target /"
 
         # Frictionless install didn't exist pre-3.2.0, so in that case we fall
         # through and do a regular install.
         elsif host['roles'].include? 'frictionless' and ! version_is_less(version, '3.2.0')
+          # PE 3.4 introduced the ability to pass in config options to the bash script in the form
+          # of <section>:<key>=<value>
+          frictionless_install_opts = []
+          if host.has_key?('frictionless_options') and !  version_is_less(version, '3.4.0')
+            # since we have options to pass in, we need to tell the bash script
+            host['frictionless_options'].each do |section, settings|
+              settings.each do |key, value|
+                frictionless_install_opts << "#{section}:#{key}=#{value}"
+              end
+            end
+          end
+
           pe_debug = host[:pe_debug] || opts[:pe_debug] ? ' -x' : ''
-          "cd #{host['working_dir']} && curl -kO https://#{master}:8140/packages/#{version}/install.bash && bash#{pe_debug} install.bash"
+          "cd #{host['working_dir']} && curl --tlsv1 -kO https://#{master}:8140/packages/#{version}/install.bash && bash#{pe_debug} install.bash #{frictionless_install_opts.join(' ')}".strip
+        elsif host['platform'] =~ /osx/
+          version = host['pe_ver'] || opts[:pe_ver]
+          pe_debug = host[:pe_debug] || opts[:pe_debug] ? ' -verboseR' : ''
+          "cd #{host['working_dir']} && hdiutil attach #{host['dist']}.dmg && installer#{pe_debug} -pkg /Volumes/puppet-enterprise-#{version}/puppet-enterprise-installer-#{version}.pkg -target /"
+        elsif host['platform'] =~ /eos/
+          commands = ['enable', "extension puppet-enterprise-#{version}-#{host['platform']}.swix"]
+          command = commands.join("\n")
+          "Cli -c '#{command}'"
         else
           pe_debug = host[:pe_debug] || opts[:pe_debug]  ? ' -D' : ''
           "cd #{host['working_dir']}/#{host['dist']} && ./#{host['pe_installer']}#{pe_debug} -a #{host['working_dir']}/answers"
         end
       end
 
-      #Create the Higgs install command string based upon the host and options settings.  Installation command will be run as a 
+      #Create the Higgs install command string based upon the host and options settings.  Installation command will be run as a
       #background process.  The output of the command will be stored in the provided host['higgs_file'].
       # @param [Host] host The host that Higgs is to be installed on
       #                    The host object must have the 'working_dir', 'dist' and 'pe_installer' field set correctly.
@@ -359,14 +375,24 @@ module Beaker
             on host, "cd #{host['working_dir']}; tar -xvf #{filename}.tar"
           end
         else
-          extension = link_exists?("#{path}/#{filename}.tar.gz") ? ".tar.gz" : ".tar"
+          if host['platform'] =~ /eos/
+            extension = '.swix'
+          else
+            extension = link_exists?("#{path}/#{filename}.tar.gz") ? ".tar.gz" : ".tar"
+          end
           if not link_exists?("#{path}/#{filename}#{extension}")
             raise "attempting installation on #{host}, #{path}/#{filename}#{extension} does not exist"
           end
-          unpack = 'tar -xvf -'
-          unpack = extension =~ /gz/ ? 'gunzip | ' + unpack  : unpack
 
-          on host, "cd #{host['working_dir']}; curl #{path}/#{filename}#{extension} | #{unpack}"
+          if host['platform'] =~ /eos/
+            commands = ['enable', "copy #{path}/#{filename}#{extension} extension:"]
+            command = commands.join("\n")
+            on host, "Cli -c '#{command}'"
+          else
+            unpack = 'tar -xvf -'
+            unpack = extension =~ /gz/ ? 'gunzip | ' + unpack  : unpack
+            on host, "cd #{host['working_dir']}; curl #{path}/#{filename}#{extension} | #{unpack}"
+          end
         end
       end
 
@@ -384,7 +410,7 @@ module Beaker
       def fetch_puppet(hosts, opts)
         hosts.each do |host|
           # We install Puppet from the master for frictionless installs, so we don't need to *fetch* anything
-          next if host['roles'].include? 'frictionless' and ! version_is_less(opts[:pe_ver] || host['pe_ver'], '3.2.0')
+          next if host['roles'].include?('frictionless') && (! version_is_less(opts[:pe_ver] || host['pe_ver'], '3.2.0'))
 
           if host['platform'] =~ /windows/
             fetch_puppet_on_windows(host, opts)
@@ -403,9 +429,9 @@ module Beaker
         klass = host['platform'].gsub(/-/, '_').gsub(/\./,'')
         klass = "pe_repo::platform::#{klass}"
         on dashboard, "cd /opt/puppet/share/puppet-dashboard && /opt/puppet/bin/bundle exec /opt/puppet/bin/rake nodeclass:add[#{klass},skip]"
-        on dashboard, "cd /opt/puppet/share/puppet-dashboard && /opt/puppet/bin/bundle exec /opt/puppet/bin/rake node:add[#{master}]"
+        on dashboard, "cd /opt/puppet/share/puppet-dashboard && /opt/puppet/bin/bundle exec /opt/puppet/bin/rake node:add[#{master},,,skip]"
         on dashboard, "cd /opt/puppet/share/puppet-dashboard && /opt/puppet/bin/bundle exec /opt/puppet/bin/rake node:addclass[#{master},#{klass}]"
-        on master, "puppet agent -t", :acceptable_exit_codes => [0,2]
+        on master, puppet("agent -t"), :acceptable_exit_codes => [0,2]
       end
 
       #Perform a Puppet Enterprise upgrade or install
@@ -431,6 +457,10 @@ module Beaker
         pre30database = version_is_less(opts[:pe_ver] || database['pe_ver'], '3.0')
         pre30master = version_is_less(opts[:pe_ver] || master['pe_ver'], '3.0')
 
+        unless version_is_less(opts[:pe_ver] || master['pe_ver'], '3.4')
+          master['puppetservice'] = 'pe-puppetserver'
+        end
+
         # Set PE distribution for all the hosts, create working dir
         use_all_tar = ENV['PE_USE_ALL_TAR'] == 'true'
         hosts.each do |host|
@@ -466,26 +496,27 @@ module Beaker
         install_hosts.each do |host|
           if host['platform'] =~ /windows/
             on host, installer_cmd(host, opts)
-          elsif host['platform'] =~ /osx/
-            on host, installer_cmd(host, opts)
-            #set the certname and master
-            on host, puppet("config set server #{master}")
-            on host, puppet("config set certname #{host}")
-            #run once to request cert
-            on host, puppet_agent('-t'), :acceptable_exit_codes => [1]
           else
             # We only need answers if we're using the classic installer
             version = host['pe_ver'] || opts[:pe_ver]
-            if (! host['roles'].include? 'frictionless') || version_is_less(version, '3.2.0')
-              answers = Beaker::Answers.create(opts[:pe_ver] || host['pe_ver'], hosts, opts)
-              create_remote_file host, "#{host['working_dir']}/answers", answers.answer_string(host)
-            else
+            if host['roles'].include?('frictionless') &&  (! version_is_less(version, '3.2.0'))
               # If We're *not* running the classic installer, we want
               # to make sure the master has packages for us.
               deploy_frictionless_to_master(host)
+              on host, installer_cmd(host, opts)
+            elsif host['platform'] =~ /osx|eos/
+              # If we're not frictionless, we need to run the OSX special-case
+              on host, installer_cmd(host, opts)
+              #set the certname and master
+              on host, puppet("config set server #{master}")
+              on host, puppet("config set certname #{host}")
+              #run once to request cert
+              on host, puppet_agent('-t'), :acceptable_exit_codes => [1]
+            else
+              answers = Beaker::Answers.create(opts[:pe_ver] || host['pe_ver'], hosts, opts)
+              create_remote_file host, "#{host['working_dir']}/answers", answers.answer_string(host)
+              on host, installer_cmd(host, opts)
             end
-
-            on host, installer_cmd(host, opts)
           end
 
           # On each agent, we ensure the certificate is signed then shut down the agent
@@ -531,7 +562,7 @@ module Beaker
       # @param  [Hash{Symbol=>Symbol, String}] opts The options
       # @option opts [String] :pe_dir Default directory or URL to pull PE package from
       #                  (Otherwise uses individual hosts pe_dir)
-      # @option opts [String] :pe_ver Default PE version to install 
+      # @option opts [String] :pe_ver Default PE version to install
       #                  (Otherwise uses individual hosts pe_ver)
       # @raise [StandardError] When installation times out
       #
@@ -597,23 +628,33 @@ module Beaker
       #Install FOSS based upon host configuration and options
       # @example will install puppet 3.6.1 from native puppetlabs provided packages wherever possible and will fail over to gem installation when impossible
       #  install_puppet({
-      #    :version        => '3.6.1',
-      #    :facter_version => '2.0.1',
-      #    :hiera_version  => '1.3.3',
-      #    :default_action => 'gem_install'
+      #    :version          => '3.6.1',
+      #    :facter_version   => '2.0.1',
+      #    :hiera_version    => '1.3.3',
+      #    :default_action   => 'gem_install',
+      #
+      #   })
+      #
       #
       # @example Will install latest packages on Enterprise Linux and Debian based distros and fail hard on all othere platforms.
       #  install_puppet()
       #
       # @note This will attempt to add a repository for apt.puppetlabs.com on
-      #       Debian or Ubuntu machines, or yum.puppetlabs.com on EL or Fedora
+      #       Debian, Ubuntu, or Cumulus machines, or yum.puppetlabs.com on EL or Fedora
       #       machines, then install the package 'puppet'.
+      # @param [Hash{Symbol=>String}] opts
+      # @option opts [String] :version Version of puppet to download
+      # @option opts [String] :mac_download_url Url to download msi pattern of %url%/puppet-%version%.msi
+      # @option opts [String] :win_download_url Url to download dmg  pattern of %url%/(puppet|hiera|facter)-%version%.msi
       #
       # @api dsl
       # @return nil
       # @raise [StandardError] When encountering an unsupported platform by default, or if gem cannot be found when default_action => 'gem_install'
       # @raise [FailTest] When error occurs during the actual installation process
       def install_puppet(opts = {})
+        default_download_url = 'http://downloads.puppetlabs.com'
+        opts = {:win_download_url => "#{default_download_url}/windows",
+                :mac_download_url => "#{default_download_url}/mac"}.merge(opts)
         hosts.each do |host|
           if host['platform'] =~ /el-(5|6|7)/
             relver = $1
@@ -621,7 +662,7 @@ module Beaker
           elsif host['platform'] =~ /fedora-(\d+)/
             relver = $1
             install_puppet_from_rpm host, opts.merge(:release => relver, :family => 'fedora')
-          elsif host['platform'] =~ /(ubuntu|debian)/
+          elsif host['platform'] =~ /(ubuntu|debian|cumulus)/
             install_puppet_from_deb host, opts
           elsif host['platform'] =~ /windows/
             relver = opts[:version]
@@ -643,6 +684,22 @@ module Beaker
         nil
       end
 
+      # Configure a host entry on the give host
+      # @example: will add a host entry for forge.puppetlabs.com
+      #   add_system32_hosts_entry(host, { :ip => '23.251.154.122', :name => 'forge.puppetlabs.com' })
+      #
+      # @api dsl
+      # @return nil
+      def add_system32_hosts_entry(host, opts = {})
+        if host['platform'] =~ /windows/
+          hosts_file = "C:\\Windows\\System32\\Drivers\\etc\\hosts"
+          host_entry = "#{opts['ip']}`t`t#{opts['name']}"
+          on host, powershell("\$text = \\\"#{host_entry}\\\"; Add-Content -path '#{hosts_file}' -value \$text")
+        else
+          raise "nothing to do for #{host.name} on #{host['platform']}"
+        end
+      end
+
       # Installs Puppet and dependencies using rpm
       #
       # @param [Host] host The host to install packages on
@@ -662,7 +719,7 @@ module Beaker
       def install_puppet_from_rpm( host, opts )
         release_package_string = "http://yum.puppetlabs.com/puppetlabs-release-#{opts[:family]}-#{opts[:release]}.noarch.rpm"
 
-        on host, "rpm -ivh #{release_package_string}"
+        on host, "rpm -q --quiet puppetlabs-release || rpm -ivh #{release_package_string}"
 
         if opts[:facter_version]
           on host, "yum install -y facter-#{opts[:facter_version]}"
@@ -720,9 +777,7 @@ module Beaker
       # @param [Host] host The host to install packages on
       # @param [Hash{Symbol=>String}] opts An options hash
       # @option opts [String] :version The version of Puppet to install, required
-      #
-      # @return nil
-      # @api private
+      # @option opts [String] :win_download_url The url to download puppet from
       def install_puppet_from_msi( host, opts )
         #only install 64bit builds if
         # - we are on puppet version 3.7+
@@ -734,7 +789,7 @@ module Beaker
         else
           host['dist'] = "puppet-#{version}"
         end
-        link = "http://downloads.puppetlabs.com/windows/#{host['dist']}.msi"
+        link = "#{opts[:win_download_url]}/#{host['dist']}.msi"
         if not link_exists?( link )
           raise "Puppet #{version} at #{link} does not exist!"
         end
@@ -755,6 +810,7 @@ module Beaker
       # @option opts [String] :version The version of Puppet to install, required
       # @option opts [String] :facter_version The version of Facter to install, required
       # @option opts [String] :hiera_version The version of Hiera to install, required
+      # @option opts [String] :mac_download_url Url to download msi pattern of %url%/puppet-%version%.msi
       #
       # @return nil
       # @api private
@@ -763,9 +819,9 @@ module Beaker
         facter_ver = opts[:facter_version]
         hiera_ver = opts[:hiera_version]
 
-        on host, "curl -O http://downloads.puppetlabs.com/mac/puppet-#{puppet_ver}.dmg"
-        on host, "curl -O http://downloads.puppetlabs.com/mac/facter-#{facter_ver}.dmg"
-        on host, "curl -O http://downloads.puppetlabs.com/mac/hiera-#{hiera_ver}.dmg"
+        on host, "curl -O #{opts[:mac_download_url]}/puppet-#{puppet_ver}.dmg"
+        on host, "curl -O #{opts[:mac_download_url]}/facter-#{facter_ver}.dmg"
+        on host, "curl -O #{opts[:mac_download_url]}/hiera-#{hiera_ver}.dmg"
 
         on host, "hdiutil attach puppet-#{puppet_ver}.dmg"
         on host, "hdiutil attach facter-#{facter_ver}.dmg"
@@ -806,9 +862,9 @@ module Beaker
 
         unless host.check_for_command( 'gem' )
           gempkg = case host['platform']
-                   when /solaris-11/                   then 'ruby-18'
-                   when /ubuntu-14/                    then 'ruby'
-                   when /solaris-10|ubuntu|debian|el-/ then 'rubygems'
+                   when /solaris-11/                            then 'ruby-18'
+                   when /ubuntu-14/                             then 'ruby'
+                   when /solaris-10|ubuntu|debian|el-|cumulus/  then 'rubygems'
                    else
                      raise "install_puppet() called with default_action " +
                            "'gem_install' but program `gem' is " +
@@ -823,7 +879,7 @@ module Beaker
           on host, 'ln -s /opt/csw/bin/gem /usr/bin/gem'
         end
 
-        if host['platform'] =~ /debian|ubuntu|solaris/
+        if host['platform'] =~ /debian|ubuntu|solaris|cumulus/
           gem_env = YAML.load( on( host, 'gem environment' ).stdout )
           gem_paths_array = gem_env['RubyGems Environment'].find {|h| h['GEM PATHS'] != nil }['GEM PATHS']
           path_with_gem = 'export PATH=' + gem_paths_array.join(':') + ':${PATH}'
@@ -930,9 +986,9 @@ module Beaker
           rpm = options[:release_yum_repo_url] +
             "/puppetlabs-release-%s-%s.noarch.rpm" % [variant, version]
 
-          on host, "rpm -ivh --force #{rpm}"
+          on host, "rpm -ivh #{rpm}"
 
-        when /^(debian|ubuntu)$/
+        when /^(debian|ubuntu|cumulus)$/
           deb = URI.join(options[:release_apt_repo_url],  "puppetlabs-release-%s.deb" % codename)
 
           on host, "wget -O /tmp/puppet.deb #{deb}"
@@ -1028,7 +1084,7 @@ module Beaker
 
           on host, find_and_sed
 
-        when /^(debian|ubuntu)$/
+        when /^(debian|ubuntu|cumulus)$/
           list = fetch_http_file( "%s/%s/%s/repo_configs/deb/" %
                          [ dev_builds_url, package_name, build_version ],
                         "pl-%s-%s-%s.list" %
@@ -1131,7 +1187,12 @@ module Beaker
             modname = opts[:module_name]
           end
 
-          on h, puppet("module install #{modname} #{version_info}")
+          puppet_opts = {}
+          if host[:default_module_install_opts].respond_to? :merge
+            puppet_opts = host[:default_module_install_opts].merge( puppet_opts )
+          end
+
+          on h, puppet("module install #{modname} #{version_info}", puppet_opts)
         end
       end
 
@@ -1144,7 +1205,7 @@ module Beaker
       # Install local module for acceptance testing
       # should be used as a presuite to ensure local module is copied to the hosts you want, particularly masters
       # @api dsl
-      # @param [Host, Array<Host>, String, Symbol] host
+      # @param [Host, Array<Host>, String, Symbol] one_or_more_hosts
       #                   One or more hosts to act upon,
       #                   or a role (String or Symbol) that identifies one or more hosts.
       # @option opts [String] :source ('./')
@@ -1160,19 +1221,21 @@ module Beaker
       # @option opts [Array] :ignore_list
       # @raise [ArgumentError] if not host is provided or module_name is not provided and can not be found in Modulefile
       #
-      def copy_module_to(host, opts = {})
-        opts = {:source => './',
-                :target_module_path => host['distmoduledir'],
-                :ignore_list => PUPPET_MODULE_INSTALL_IGNORE}.merge(opts)
-        ignore_list = build_ignore_list(opts)
-        target_module_dir = on( host, "echo #{opts[:target_module_path]}" ).stdout.chomp
-        source = File.expand_path( opts[:source] )
-        if opts.has_key?(:module_name)
-          module_name = opts[:module_name]
-        else
-          _, module_name = parse_for_modulename( source )
+      def copy_module_to(one_or_more_hosts, opts = {})
+        block_on one_or_more_hosts do |host|
+          opts = {:source => './',
+                  :target_module_path => host['distmoduledir'],
+                  :ignore_list => PUPPET_MODULE_INSTALL_IGNORE}.merge(opts)
+          ignore_list = build_ignore_list(opts)
+          target_module_dir = on( host, "echo #{opts[:target_module_path]}" ).stdout.chomp
+          source = File.expand_path( opts[:source] )
+          if opts.has_key?(:module_name)
+            module_name = opts[:module_name]
+          else
+            _, module_name = parse_for_modulename( source )
+          end
+          scp_to host, source, File.join(target_module_dir, module_name), {:ignore => ignore_list}
         end
-        scp_to host, source, File.join(target_module_dir, module_name), {:ignore => ignore_list}
       end
       alias :copy_root_module_to :copy_module_to
 
@@ -1213,18 +1276,17 @@ module Beaker
       #
       # @return [String,nil]
       def parse_for_moduleroot(possible_module_directory)
-        if File.exists?("#{possible_module_directory}/Modulefile")
+        if File.exists?("#{possible_module_directory}/Modulefile") || File.exists?("#{possible_module_directory}/metadata.json")
           possible_module_directory
         elsif possible_module_directory === '/'
           logger.error "At root, can't parse for another directory"
           nil
         else
-          logger.debug "No Modulefile found at #{possible_module_directory}, moving up"
+          logger.debug "No Modulefile or metadata.json found at #{possible_module_directory}, moving up"
           parse_for_moduleroot File.expand_path(File.join(possible_module_directory,'..'))
         end
       end
 
-
       #Parse root directory of a module for module name
       # Searches for metadata.json and then if none found, Modulefile and parses for the Name attribute
       # @param [String] root_module_dir

data/lib/beaker/dsl/wrappers.rb

@@ -16,10 +16,22 @@ module Beaker
       def facter(*args)
         options = args.last.is_a?(Hash) ? args.pop : {}
         options['ENV'] ||= {}
-        options['ENV'] = options['ENV'].merge( Command::DEFAULT_GIT_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.
+      #
+      # @api dsl
+      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.
@@ -28,7 +40,7 @@ module Beaker
       def hiera(*args)
         options = args.last.is_a?(Hash) ? args.pop : {}
         options['ENV'] ||= {}
-        options['ENV'] = options['ENV'].merge( Command::DEFAULT_GIT_ENV )
+        options[:cmdexe] = true
         Command.new('hiera', args, options )
       end
 
@@ -49,7 +61,7 @@ module Beaker
       def puppet(*args)
         options = args.last.is_a?(Hash) ? args.pop : {}
         options['ENV'] ||= {}
-        options['ENV'] = options['ENV'].merge( Command::DEFAULT_GIT_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}"
@@ -95,6 +107,32 @@ module Beaker
       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
+      # @param [Hash]     args      The commandline paramaeters to be passed to powershell
+      #
+      # @example Setting the contents of a file
+      #     powershell("Set-Content -path 'fu.txt' -value 'fu'")
+      #
+      # @example Using an alternative execution policy
+      #     powershell("Set-Content -path 'fu.txt' -value 'fu'", {'ExecutionPolicy' => 'Unrestricted'})
+      #
+      # @return [Command]
+      def powershell(command, args={})
+        ps_opts = {
+          'ExecutionPolicy' => 'Bypass',
+          'InputFormat'     => 'None',
+          'NoLogo'          => '',
+          'NoProfile'       => '',
+          'NonInteractive'  => ''
+        }
+        ps_opts.merge!(args)
+
+        arguments = " #{ps_opts.sort.map{|k,v| v.eql?('') ? "-#{k}" : "-#{k} #{v}" }.join(' ')} -Command \"#{command}\""
+        Command.new('powershell.exe', arguments, {})
+      end
     end
   end
 end