beaker 2.5.0 → 2.5.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTAxY2VmNjc1ZjM2NDAyOWM3YjM1NWYxZGI5YTE0ZTk4YzhjYTczOQ==
+    NTAxNmJlODdhMDI1ODUxMTExMDEzZDQ5ODllMjliZDdmZDVlODU4NQ==
   data.tar.gz: !binary |-
-    YTY1MzczMWY5YmNjOTRjZDA3MDE0MjM1ZjdmMjBmMzM3MjdhODI2ZQ==
+    YjU0MTg3ZTI3ZmFiMGNlYTdjOTFjZmJhYTUzOWI0NDkzODk0OTAzOA==
 SHA512:
   metadata.gz: !binary |-
-    YWQwZGE3YzVjZmRkZWZiODE5NTFmZTViMWViNGVlMTllMzFkYzMzMTdlYTM3
-    YWU4MTE2MDdiOTgzZDRmYTIxZjMyYjU2MDcxYjNmMjkyZDcyMTYyNGQwZDIx
-    YmVlYmRmNTQ5OTgxYWViOTgyZjM3NTQ5ZjJlMmUyYWQxYTE3ZjY=
+    YjU5NTJkOTRlYTg5NGRjMjgzMDU3N2RkNzUxMDM1YmY5MjFlNDBjNDc3ZjM4
+    NWVkMTg2ZmU2ZmUzZTU3MGU4ZDU5YjhjYjRjNmQzOGVlNzMxYTdkODBhMDFj
+    YTY3OTEyNzdiZjM5MjEwMWU5M2RmOWFkZGUzMGFiMDA4YzFjMjA=
   data.tar.gz: !binary |-
-    Zjk1NzdiNjg5N2Y2YjE3MGZhMzZkYTY5M2RiNWIyYWRjOTY5NTIzY2FjMjFl
-    YTNkYmYxMTM0MmVkYTEzYzgzYTZmZjA3OGEzZTIzMzA2YzJjODM1YTY5ZTY3
-    ZThkYTI3NTVkMzY4ZGVkNGYyYzNmNmUwNTA0OTkwZGQ0MDUwYzQ=
+    MWY1N2ZmYzBiNGFlMjQyOTdlOTUyMTIwOTU3NDE4NTMxNWI1ZTJkMTEwOWVm
+    MjllNzM3ODUxMDUyMWZkMzAwYWM2OTFmNTgzZjI4NThmOGM4YTI5NDBmOGMw
+    ODNhY2M4ZGM3ZDEwNTBhZmZmNzBlOWMyYmE5MWM1MWYwY2MwZDY=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 23 Feb, 2015 (9ad8bd4c)](#LATEST)
+* [LATEST - 4 Mar, 2015 (958ab02d)](#LATEST)
+* [beaker2.5.0 - 23 Feb, 2015 (c421cf95)](#beaker2.5.0)
 * [beaker2.4.1 - 13 Feb, 2015 (84400ed1)](#beaker2.4.1)
 * [beaker2.4.0 - 13 Feb, 2015 (bc5a6676)](#beaker2.4.0)
 * [beaker2.3.0 - 29 Jan, 2015 (3d185da0)](#beaker2.3.0)
@@ -71,7 +72,262 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 23 Feb, 2015 (9ad8bd4c)
+### <a name = "LATEST">LATEST - 4 Mar, 2015 (958ab02d)
+
+* (GEM) update beaker version to 2.5.1 (958ab02d)
+
+* Merge pull request #719 from kevpl/qeng1841_aio_pathsupdate (c6a15c8f)
+
+
+```
+Merge pull request #719 from kevpl/qeng1841_aio_pathsupdate
+
+(QENG-1841) updated AIO pathing for linux & windows
+```
+* Merge pull request #726 from anodelman/maint (a23acbf2)
+
+
+```
+Merge pull request #726 from anodelman/maint
+
+(maint) Upgrade google-api-client dependency to fix Ruby 1.9.x...
+```
+* (maint) Upgrade google-api-client dependency to fix Ruby 1.9.x... (d5301654)
+
+
+```
+(maint) Upgrade google-api-client dependency to fix Ruby 1.9.x...
+
+- compatibility
+
+- for puppetdb project:
+
+"
+Retriable was upgraded today (Jan 30th) and they shipped a version 2.0.0
+that
+requires Ruby >=2.0.0.
+
+In google-api-client 0.7.1, we were pulling in version >= 1.4 of
+retriable. In 0.8.2
+they have a fix that pulls in ~> 1.4 version of retriable, thus pinning
+the ceiling
+on the upgrade to retriable 2.0.0.
+"
+```
+* Merge pull request #626 from carlossg/ssh-restart (31bc7aa4)
+
+
+```
+Merge pull request #626 from carlossg/ssh-restart
+
+[docker] No need to restart sshd
+```
+* Merge pull request #721 from kevpl/qeng1913_aio_pullback (69130a54)
+
+
+```
+Merge pull request #721 from kevpl/qeng1913_aio_pullback
+
+(QENG-1913) rolling back the name change for pe-puppet that was made for AIO
+```
+* Merge pull request #722 from puppetlabs/revert-715-acceptance (fdf906b8)
+
+
+```
+Merge pull request #722 from puppetlabs/revert-715-acceptance
+
+Revert "(QENG-1869) create beaker host.rb acceptance tests"
+```
+* Revert "(QENG-1869) create beaker host.rb acceptance tests" (d7e2c7c3)
+
+* (QENG-1913) rolling back the name change for pe-puppet that was made for AIO (d68fe7d7)
+
+* Merge pull request #716 from anodelman/maint (6e420185)
+
+
+```
+Merge pull request #716 from anodelman/maint
+
+(QENG-1681) upgrade_pe method is generating errors when attempted...
+```
+* (QENG-1841) updated AIO pathing for linux & windows (fdfa69be)
+
+* Merge pull request #715 from anodelman/acceptance (c6c377c8)
+
+
+```
+Merge pull request #715 from anodelman/acceptance
+
+(QENG-1869) create beaker host.rb acceptance tests
+```
+* Merge pull request #714 from kevpl/qeng1721_aio_windowsinstall (14f2239d)
+
+
+```
+Merge pull request #714 from kevpl/qeng1721_aio_windowsinstall
+
+(QENG-1721) added installation support of dev versions of windows puppet...
+```
+* (QENG-1681) upgrade_pe method is generating errors when attempted... (ae0d7333)
+
+
+```
+(QENG-1681) upgrade_pe method is generating errors when attempted...
+
+...on PE 3.7.0 and later
+
+- do pe version comparison in the upgrader method, not the answer file
+  generator
+- use proper semvar dot comparison of versions, not just string compare
+- handle not knowing what the pe_ver is currently installed
+- unrelated nit: remove duplicate key entries in answer file generation
+```
+* Merge pull request #647 from mcanevet/feature/openstack/generate_key_pair (32e123e9)
+
+
+```
+Merge pull request #647 from mcanevet/feature/openstack/generate_key_pair
+
+(gh-646) Create random keypair
+```
+* Merge pull request #699 from kevpl/qeng1429_should_fail_not_error (b757a552)
+
+
+```
+Merge pull request #699 from kevpl/qeng1429_should_fail_not_error
+
+(QENG-1429) added clause to catch Beaker & Minitest assertions
+```
+* Merge pull request #708 from kevpl/qeng1847_aio_hostparams (a321d264)
+
+
+```
+Merge pull request #708 from kevpl/qeng1847_aio_hostparams
+
+(QENG-1847) changed internal host path attribute usage to host.puppet me...
+```
+* Merge pull request #686 from mcanevet/fix/openstack/use_openstack_tenant (0aa7d5e6)
+
+
+```
+Merge pull request #686 from mcanevet/fix/openstack/use_openstack_tenant
+
+(gh-685) Add openstack_tenant to network_client init
+```
+* Merge pull request #697 from anodelman/cygwin-less (ebda7a6d)
+
+
+```
+Merge pull request #697 from anodelman/cygwin-less
+
+(QENG-1735) set up local windows vm without cygwin and get it working
+```
+* (QENG-1721) added installation support of dev versions of windows puppet-agent (45f92543)
+
+* Merge pull request #670 from petems/MAINT-ps_windows_reindent (1f3034c5)
+
+
+```
+Merge pull request #670 from petems/MAINT-ps_windows_reindent
+
+(MAINT) Fix indentation
+```
+* Merge pull request #711 from jonnytpuppet/rsync_support (27672383)
+
+
+```
+Merge pull request #711 from jonnytpuppet/rsync_support
+
+Added support for rsync
+```
+* Merge pull request #713 from anodelman/maint (539f176d)
+
+
+```
+Merge pull request #713 from anodelman/maint
+
+(MAINT) fix broken spec tests
+```
+* (MAINT) fix broken spec tests (76e06a75)
+
+
+```
+(MAINT) fix broken spec tests
+
+- accidental breakage of spec tests
+- also removed deprecated rspec method call
+```
+* Merge pull request #634 from liamjbennett/puppet_conf (baeee93d)
+
+
+```
+Merge pull request #634 from liamjbennett/puppet_conf
+
+(gh-474) Adding a utility method for puppet.conf file
+```
+* Merge pull request #689 from liamjbennett/powershell_fix (854d0aa0)
+
+
+```
+Merge pull request #689 from liamjbennett/powershell_fix
+
+(gh-688) Fixing the powershell wrapper to use an array of arguments
+```
+* QENG-1878 Added support for rsync (d2076dec)
+
+* (QENG-1869) create beaker host.rb acceptance tests (e4c0fcf9)
+
+
+```
+(QENG-1869) create beaker host.rb acceptance tests
+
+- tests that exercise basic host.rb functionality
+```
+* (QENG-1847) changed internal host path attribute usage to host.puppet method calls where possible (0179294e)
+
+* (QENG-1380) design beaker DSL based acceptance tests (8341e56d)
+
+
+```
+(QENG-1380) design beaker DSL based acceptance tests
+
+- initial directory hierarchy for beaker acceptance testing
+```
+* (QENG-1429) added clause to catch Beaker & Minitest assertions (d91692dd)
+
+* (gh-688) Fixing the powershell wrapper to use an array of arguments (b5ebc137)
+
+* (gh-685) Add openstack_tenant to network_client init (58c6eca1)
+
+* (MAINT) Fix indentation (62c23595)
+
+* (QENG-1735) set up local windows vm without cygwin and get it working (9c32cac7)
+
+
+```
+(QENG-1735) set up local windows vm without cygwin and get it working
+
+- ensure that you can install PE
+- deal with setting PATH/RUBY env vars
+- update DSL methods to work on windows without bash
+```
+* (gh-646) Create random keypair (7b660047)
+
+* (gh-474) Adding a utility method for puppet.conf file (8965fec0)
+
+* (gh-626) [docker] Ensure that the ssh server can be restarted and container keeps running (85123f12)
+
+
+```
+(gh-626) [docker] Ensure that the ssh server can be restarted and container keeps running
+
+If the sshd process dies then the container stops
+Allow configuring the execution or not of set_env
+Fix #611
+```
+### <a name = "beaker2.5.0">beaker2.5.0 - 23 Feb, 2015 (c421cf95)
+
+* (HISTORY) update beaker history for gem release 2.5.0 (c421cf95)
 
 * (GEM) update beaker version to 2.5.0 (9ad8bd4c)
 

data/beaker.gemspec

@@ -38,11 +38,12 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'net-ssh', '~> 2.9'
   s.add_runtime_dependency 'net-scp', '~> 1.2'
   s.add_runtime_dependency 'inifile', '~> 2.0'
+  s.add_runtime_dependency 'rsync', '~> 1.0.9'
 
   # Optional provisioner specific support
   s.add_runtime_dependency 'rbvmomi', '~> 1.8'
   s.add_runtime_dependency 'fission', '~> 0.4'
-  s.add_runtime_dependency 'google-api-client', '~> 0.7'
+  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 'fog', '~> 1.25'

data/lib/beaker/answers/version20.rb

@@ -34,7 +34,6 @@ module Beaker
       master_a = {
         :q_puppetmaster_install => 'y',
         :q_puppetmaster_certname => master,
-        :q_puppetmaster_install => 'y',
         :q_puppetmaster_dnsaltnames => master_dns_altnames,
         :q_puppetmaster_enterpriseconsole_hostname => dashboard,
         :q_puppetmaster_enterpriseconsole_port => answer_for(options, :q_puppetmaster_enterpriseconsole_port, 443),

data/lib/beaker/answers/version28.rb

@@ -35,7 +35,6 @@ module Beaker
       master_a = {
         :q_puppetmaster_install => 'y',
         :q_puppetmaster_certname => master,
-        :q_puppetmaster_install => 'y',
         :q_puppetmaster_dnsaltnames => master_dns_altnames,
         :q_puppetmaster_enterpriseconsole_hostname => dashboard,
         :q_puppetmaster_enterpriseconsole_port => answer_for(options, :q_puppetmaster_enterpriseconsole_port, 443),

data/lib/beaker/answers/version34.rb

@@ -37,7 +37,7 @@ module Beaker
       }
 
       # If we're installing or upgrading from a non-RBAC version, set the 'admin' password
-      if @options[:type] == :upgrade && @options[:HOSTS][dashboard.name][:pe_ver] < "3.4.0"
+      if @options[:type] == :upgrade && @options[:set_console_password]
         dashboard_password = "'#{@options[:answers][:q_puppet_enterpriseconsole_auth_password]}'"
         the_answers[dashboard.name][:q_puppet_enterpriseconsole_auth_password] = dashboard_password
       end

data/lib/beaker/command.rb

@@ -70,7 +70,7 @@ module Beaker
     def cmd_line host, cmd = @command, env = @environment
       env_string = env.nil? ? '' : environment_string_for( host, env )
 
-      cygwin = ((host['platform'] =~ /windows/) and @cmdexe) ? 'cmd.exe /c' : nil
+      cygwin = ((host['platform'] =~ /windows/) and host.is_cygwin? and @cmdexe) ? 'cmd.exe /c' : nil
 
       # This will cause things like `puppet -t -v agent` which is maybe bad.
       [env_string, cygwin, cmd, options_string, args_string].compact.reject(&:empty?).join(' ')

data/lib/beaker/dsl/helpers.rb

@@ -183,7 +183,7 @@ module Beaker
         end
       end
 
-      # Move a local file to a remote host
+      # Move a local file to a remote host using scp
       # @note If using {Beaker::Host} for the hosts *scp* is not
       #   required on the system as it uses Ruby's net/scp library.  The
       #   net-scp gem however is required (and specified in the gemspec.
@@ -210,6 +210,27 @@ module Beaker
         end
       end
 
+      # Move a local file or directory to a remote host using rsync
+      # @note rsync is required on the local host.
+      #
+      # @param [Host, #do_scp_to] host A host object that responds like
+      #                                {Beaker::Host}.
+      # @param [String] from_path A local path to a file or directory.
+      # @param [String] to_path   A remote path to copy *from_path* to.
+      # @!macro common_opts
+      #
+      # @return [Result] Returns the result of the rsync operation
+      def rsync_to host, from_path, to_path, opts = {}
+        block_on host do | host |
+          if host['platform'] =~ /windows/ && to_path.match('`cygpath')
+            result = host.echo "#{to_path}"
+            to_path = result.raw_output.chomp
+          end
+          @result = host.do_rsync_to(from_path, to_path, opts)
+          @result
+        end
+      end
+
       # Deploy packaging configurations generated by
       # https://github.com/puppetlabs/packaging to a host.
       #
@@ -238,13 +259,24 @@ module Beaker
       # @param [String] file_path A remote path to place *file_content* at.
       # @param [String] file_content The contents of the file to be placed.
       # @!macro common_opts
+      # @option opts [String] :protocol Name of the underlying transfer method.
+      #                                 Valid options are 'scp' or 'rsync'.
       #
       # @return [Result] Returns the result of the underlying SCP operation.
       def create_remote_file(hosts, file_path, file_content, opts = {})
         Tempfile.open 'beaker' do |tempfile|
           File.open(tempfile.path, 'w') {|file| file.puts file_content }
 
-          scp_to hosts, tempfile.path, file_path, opts
+          opts[:protocol] ||= 'scp'
+          case opts[:protocol]
+            when 'scp'
+              scp_to hosts, tempfile.path, file_path, opts
+            when 'rsync'
+              rsync_to hosts, tempfile.path, file_path, opts
+            else
+              logger.debug "Unsupported transfer protocol, returning nil"
+              nil
+          end
         end
       end
 
@@ -553,7 +585,7 @@ module Beaker
         end
 
         begin
-          backup_file = backup_the_file(host, host['puppetconfdir'], testdir, 'puppet.conf')
+          backup_file = backup_the_file(host, host.puppet('master')['confdir'], testdir, 'puppet.conf')
           lay_down_new_puppet_conf host, conf_opts, testdir
 
           if host.use_service_scripts? && !service_args[:bypass_service_script]
@@ -564,6 +596,8 @@ module Beaker
 
           yield self if block_given?
 
+        rescue Beaker::DSL::Assertions, Minitest::Assertion => early_assertion
+          fail_test(early_assertion)
         rescue Exception => early_exception
           original_exception = RuntimeError.new("PuppetAcceptance::DSL::Helpers.with_puppet_running_on failed (check backtrace for location) because: #{early_exception}\n#{early_exception.backtrace.join("\n")}\n")
           raise(original_exception)
@@ -612,8 +646,7 @@ module Beaker
 
       # @!visibility private
       def restore_puppet_conf_from_backup( host, backup_file )
-        puppetpath = host['puppetconfdir']
-        puppet_conf = File.join(puppetpath, "puppet.conf")
+        puppet_conf = host.puppet('master')['config']
 
         if backup_file
           host.exec( Command.new( "if [ -f '#{backup_file}' ]; then " +
@@ -693,8 +726,9 @@ module Beaker
 
       # @!visibility private
       def lay_down_new_puppet_conf( host, configuration_options, testdir )
-        puppetconf_test = "#{testdir}/puppet.conf"
-        puppetconf_main = "#{host['puppetconfdir']}/puppet.conf"
+        puppetconf_main = host.puppet('master')['config']
+        puppetconf_filename = File.basename(puppetconf_main)
+        puppetconf_test = File.join(testdir, puppetconf_filename)
 
         new_conf = puppet_conf_for( host, configuration_options )
         create_remote_file host, puppetconf_test, new_conf.to_s
@@ -708,7 +742,7 @@ module Beaker
 
       # @!visibility private
       def puppet_conf_for host, conf_opts
-        puppetconf = host.exec( Command.new( "cat #{host['puppetconfdir']}/puppet.conf" ) ).stdout
+        puppetconf = host.exec( Command.new( "cat #{host.puppet('master')['config']}" ) ).stdout
         new_conf   = IniFile.new( puppetconf ).merge( conf_opts )
 
         new_conf
@@ -1240,23 +1274,17 @@ module Beaker
           vardir = agent.puppet['vardir']
           agent_running = true
           while agent_running
-            result = on host, "[ -e '#{vardir}/state/agent_catalog_run.lock' ]", :acceptable_exit_codes => [0,1]
-            agent_running = (result.exit_code == 0)
-            sleep 2 unless agent_running
+            agent_running = agent.file_exist?("#{vardir}/state/agent_catalog_run.lock")
+            if agent_running
+              sleep 2
+            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`
-          result = on agent, "[ -e /etc/init.d/pe-puppet-agent ]", :acceptable_exit_codes => [0,1]
           agent_service = 'pe-puppet-agent'
-          if result.exit_code != 0
-            if agent['pe_ver'] && !version_is_less(agent['pe_ver'], '4.0')
-              agent_service = 'puppet'
-            else
-              agent_service = 'pe-puppet'
-            end
-          end
+          agent_service = 'pe-puppet' unless agent.file_exist?('/etc/init.d/pe-puppet-agent')
 
           # Under a number of stupid circumstances, we can't stop the
           # agent using puppet.  This is usually because of issues with
@@ -1380,7 +1408,7 @@ module Beaker
           hiera_config[:yaml][:datadir] = host[:hieradatadir]
           hiera_config[:hierarchy] = hierarchy
           hiera_config[:logger] = 'console'
-          create_remote_file host, host[:hieraconf], hiera_config.to_yaml
+          create_remote_file host, host.puppet['hiera_config'], hiera_config.to_yaml
         end
       end