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:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 60bedb07e0d938657c68fd639602effabaad255ed36f6df717c5dd54ec78e02d
|
4
|
+
data.tar.gz: 6bb70062423ad0789c073f553454e99c68ee4cd0c534523e7403a2167730219b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
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.
|
8
|
-
:puppet_agent_version => ENV['BEAKER_PUPPET_AGENT_VERSION'] || '5.5.
|
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'))
|
data/beaker-puppet.gemspec
CHANGED
@@ -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', '~>
|
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,
|
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,
|
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,
|
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,
|
221
|
+
logger.info(file_contents_on(host, log_file_escaped))
|
218
222
|
end
|
219
223
|
|
220
224
|
host.close unless host.is_cygwin?
|
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.
|
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-
|
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: '
|
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: '
|
74
|
+
version: '13.0'
|
75
75
|
- !ruby/object:Gem::Dependency
|
76
76
|
name: simplecov
|
77
77
|
requirement: !ruby/object:Gem::Requirement
|