beaker-puppet 1.18.15 → 1.19.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4d7464999b32767212b3ba2f20b6018446e11d2d87a1c4b05b623c82b2cd1112
4
- data.tar.gz: 96e6513d7e477276ac30d4c380d79f70e37a2ccad1ac87f9dc197d57c9ec60f9
3
+ metadata.gz: 60bedb07e0d938657c68fd639602effabaad255ed36f6df717c5dd54ec78e02d
4
+ data.tar.gz: 6bb70062423ad0789c073f553454e99c68ee4cd0c534523e7403a2167730219b
5
5
  SHA512:
6
- metadata.gz: df1b72ec841b70eac0fa3bab3ad731b22c0070b2303178f0da110fbe728de077f31a1e4ada11b71c008cf9785decd947df2ca7bf4845ad23ab3f7706362b26fd
7
- data.tar.gz: 690d02f1c91398b44ec9eb3a10440349e6b4ba05258a3be48885124bf6c0bf673f99648efffed0244328476c0da6dba5fb5629c57cadf8f945c1efbb737ed776
6
+ metadata.gz: 15ad14bf1ba9ca281a89eba2f91b8345b93fcdc4652680ab3ba662bdc545d416d17ec04845393d6dd87568725dd97b2cde032483dde2e8cf33155e66d5a329eb
7
+ data.tar.gz: 637788b471cd1be8902dbe2feb12eeb3112a80c7542adbed718a1511ad757cdd7cef3802783165ac50ef90e995972dbb6765659052b986663b57ea61003f3cf1
@@ -4,8 +4,8 @@ require 'beaker-puppet'
4
4
  # all versions are required for osx
5
5
  hosts.each do |host|
6
6
  install_puppet_on(host, {
7
- :version => ENV['BEAKER_PUPPET_VERSION'] || '5.5.13',
8
- :puppet_agent_version => ENV['BEAKER_PUPPET_AGENT_VERSION'] || '5.5.13'
7
+ :version => ENV['BEAKER_PUPPET_VERSION'] || '5.5.20',
8
+ :puppet_agent_version => ENV['BEAKER_PUPPET_AGENT_VERSION'] || '5.5.20'
9
9
  })
10
10
 
11
11
  on(host, puppet('resource user puppet ensure=present'))
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
21
21
  s.add_development_dependency 'rspec', '~> 3.0'
22
22
  s.add_development_dependency 'rspec-its'
23
23
  s.add_development_dependency 'fakefs', '~> 0.6', '< 0.14.0'
24
- s.add_development_dependency 'rake', '~> 10.1'
24
+ s.add_development_dependency 'rake', '~> 13.0'
25
25
  s.add_development_dependency 'simplecov'
26
26
  s.add_development_dependency 'pry', '~> 0.10'
27
27
 
@@ -115,19 +115,21 @@ module Beaker
115
115
  block_on hosts do | host |
116
116
  msi_opts['PUPPET_AGENT_STARTUP_MODE'] ||= 'Manual'
117
117
  batch_path, log_file = create_install_msi_batch_on(host, msi_path, msi_opts)
118
-
118
+ # Powershell command looses an escaped slash resulting in cygwin relative path
119
+ # See https://github.com/puppetlabs/beaker/pull/1626#issuecomment-621341555
120
+ log_file_escaped = log_file.gsub('\\','\\\\\\')
119
121
  # begin / rescue here so that we can reuse existing error msg propagation
120
122
  begin
121
123
  # 1641 = ERROR_SUCCESS_REBOOT_INITIATED
122
124
  # 3010 = ERROR_SUCCESS_REBOOT_REQUIRED
123
125
  on host, Command.new("\"#{batch_path}\"", [], { :cmdexe => true }), :acceptable_exit_codes => [0, 1641, 3010]
124
126
  rescue
125
- logger.info(file_contents_on(host, log_file))
127
+ logger.info(file_contents_on(host, log_file_escaped))
126
128
  raise
127
129
  end
128
130
 
129
131
  if opts[:debug]
130
- logger.info(file_contents_on(host, log_file))
132
+ logger.info(file_contents_on(host, log_file_escaped))
131
133
  end
132
134
 
133
135
  unless host.is_cygwin?
@@ -201,20 +203,22 @@ module Beaker
201
203
  def generic_install_msi_on(hosts, msi_path, msi_opts = {}, opts = {})
202
204
  block_on hosts do | host |
203
205
  batch_path, log_file = create_install_msi_batch_on(host, msi_path, msi_opts)
204
-
206
+ # Powershell command looses an escaped slash resulting in cygwin relative path
207
+ # See https://github.com/puppetlabs/beaker/pull/1626#issuecomment-621341555
208
+ log_file_escaped = log_file.gsub('\\','\\\\\\')
205
209
  # begin / rescue here so that we can reuse existing error msg propagation
206
210
  begin
207
211
  # 1641 = ERROR_SUCCESS_REBOOT_INITIATED
208
212
  # 3010 = ERROR_SUCCESS_REBOOT_REQUIRED
209
213
  on host, Command.new("\"#{batch_path}\"", [], { :cmdexe => true }), :acceptable_exit_codes => [0, 1641, 3010]
210
214
  rescue
211
- logger.info(file_contents_on(host, log_file))
215
+ logger.info(file_contents_on(host, log_file_escaped))
212
216
 
213
217
  raise
214
218
  end
215
219
 
216
220
  if opts[:debug]
217
- logger.info(file_contents_on(host, log_file))
221
+ logger.info(file_contents_on(host, log_file_escaped))
218
222
  end
219
223
 
220
224
  host.close unless host.is_cygwin?
@@ -1,3 +1,3 @@
1
1
  module BeakerPuppet
2
- VERSION = '1.18.15'
2
+ VERSION = '1.19.0'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: beaker-puppet
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.18.15
4
+ version: 1.19.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Puppet
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-03-31 00:00:00.000000000 Z
11
+ date: 2020-05-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rspec
@@ -64,14 +64,14 @@ dependencies:
64
64
  requirements:
65
65
  - - "~>"
66
66
  - !ruby/object:Gem::Version
67
- version: '10.1'
67
+ version: '13.0'
68
68
  type: :development
69
69
  prerelease: false
70
70
  version_requirements: !ruby/object:Gem::Requirement
71
71
  requirements:
72
72
  - - "~>"
73
73
  - !ruby/object:Gem::Version
74
- version: '10.1'
74
+ version: '13.0'
75
75
  - !ruby/object:Gem::Dependency
76
76
  name: simplecov
77
77
  requirement: !ruby/object:Gem::Requirement