beaker-pe 2.11.4 → 2.11.5
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 +4 -4
- data/.github/dependabot.yml +8 -0
- data/lib/beaker-pe/install/pe_utils.rb +4 -4
- data/lib/beaker-pe/version.rb +1 -1
- data/spec/beaker-pe/install/pe_utils_spec.rb +3 -3
- metadata +4 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 6b980f0786d5843b28521338cf71f98d33798f2f59c8e5068185a419dc0d1e27
|
|
4
|
+
data.tar.gz: c754f34e0e63b69f51ea3014091100cd68ef75112bab6952b4ea90ab02123d7c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f02d963ffad85af682eb35300027e72b3da36dd9b306a2eb17079e9dc34941514cefe4c2776176d430b7a3f89492bcb8a847d7077990415b799b87c555b6b693
|
|
7
|
+
data.tar.gz: 69ac13034a03600fd41932640c74e73d6d75e804b1376821d2e22e04d5b0ab4d6a0fa5f3fce272b39166b07d5b9ba63819c675d0f522bcabc5a49a98824d14ce
|
|
@@ -292,7 +292,7 @@ module Beaker
|
|
|
292
292
|
fetch_and_push_pe(host, path, filename, extension)
|
|
293
293
|
else
|
|
294
294
|
curlopts = opts[:use_proxy] ? " --proxy #{opts[:proxy_hostname]}:3128" : ""
|
|
295
|
-
on host, "cd #{host['working_dir']}; curl -O #{path}/#{filename}#{extension}#{curlopts}"
|
|
295
|
+
on host, "cd #{host['working_dir']}; curl -L -O #{path}/#{filename}#{extension}#{curlopts}"
|
|
296
296
|
end
|
|
297
297
|
end
|
|
298
298
|
end
|
|
@@ -328,7 +328,7 @@ module Beaker
|
|
|
328
328
|
on host, "cd #{host['working_dir']}; chmod 644 #{filename}#{extension}"
|
|
329
329
|
elsif host.is_cygwin?
|
|
330
330
|
curlopts = opts[:use_proxy] ? " --proxy #{opts[:proxy_hostname]}:3128" : ""
|
|
331
|
-
on host, "cd #{host['working_dir']}; curl -O #{path}/#{filename}#{extension}#{curlopts}"
|
|
331
|
+
on host, "cd #{host['working_dir']}; curl -L -O #{path}/#{filename}#{extension}#{curlopts}"
|
|
332
332
|
else
|
|
333
333
|
on host, powershell("$webclient = New-Object System.Net.WebClient; $webclient.DownloadFile('#{path}/#{filename}#{extension}','#{host['working_dir']}\\#{filename}#{extension}')")
|
|
334
334
|
end
|
|
@@ -381,7 +381,7 @@ module Beaker
|
|
|
381
381
|
command_file_push = 'cat '
|
|
382
382
|
else
|
|
383
383
|
curlopts = opts[:use_proxy] ? "--proxy #{opts[:proxy_hostname]}:3128 " : ""
|
|
384
|
-
command_file_push = "curl #{curlopts}#{path}/"
|
|
384
|
+
command_file_push = "curl -L #{curlopts}#{path}/"
|
|
385
385
|
end
|
|
386
386
|
on host, "cd #{host['working_dir']}; #{command_file_push}#{filename}#{extension} | #{unpack}"
|
|
387
387
|
|
|
@@ -661,7 +661,7 @@ module Beaker
|
|
|
661
661
|
register_feature_flags!(opts)
|
|
662
662
|
generate_installer_conf_file_for(master, all_hosts, opts)
|
|
663
663
|
step "Install PE on master" do
|
|
664
|
-
on master, installer_cmd(master, opts)
|
|
664
|
+
on master, installer_cmd(master, opts) if master['template'] !~ /-preload/
|
|
665
665
|
end
|
|
666
666
|
|
|
667
667
|
step "Stop agent on master" do
|
data/lib/beaker-pe/version.rb
CHANGED
|
@@ -1091,7 +1091,7 @@ describe ClassMixedWithDSLInstallUtils do
|
|
|
1091
1091
|
path = unixhost['pe_dir']
|
|
1092
1092
|
filename = "#{ unixhost['dist'] }"
|
|
1093
1093
|
extension = '.tar'
|
|
1094
|
-
expect( subject ).to receive( :on ).with( unixhost, "cd #{ unixhost['working_dir'] }; curl #{ path }/#{ filename }#{ extension } | tar -xvf -" ).once
|
|
1094
|
+
expect( subject ).to receive( :on ).with( unixhost, "cd #{ unixhost['working_dir'] }; curl -L #{ path }/#{ filename }#{ extension } | tar -xvf -" ).once
|
|
1095
1095
|
subject.fetch_pe( [unixhost], {} )
|
|
1096
1096
|
end
|
|
1097
1097
|
|
|
@@ -1121,7 +1121,7 @@ describe ClassMixedWithDSLInstallUtils do
|
|
|
1121
1121
|
path = unixhost['pe_dir']
|
|
1122
1122
|
filename = "#{ unixhost['dist'] }"
|
|
1123
1123
|
extension = '.tar.gz'
|
|
1124
|
-
expect( subject ).to receive( :on ).with( unixhost, "cd #{ unixhost['working_dir'] }; curl #{ path }/#{ filename }#{ extension } | gunzip | tar -xvf -" ).once
|
|
1124
|
+
expect( subject ).to receive( :on ).with( unixhost, "cd #{ unixhost['working_dir'] }; curl -L #{ path }/#{ filename }#{ extension } | gunzip | tar -xvf -" ).once
|
|
1125
1125
|
subject.fetch_pe( [unixhost], {} )
|
|
1126
1126
|
end
|
|
1127
1127
|
|
|
@@ -1167,7 +1167,7 @@ describe ClassMixedWithDSLInstallUtils do
|
|
|
1167
1167
|
path = machost['pe_dir']
|
|
1168
1168
|
filename = "#{ machost['dist'] }"
|
|
1169
1169
|
extension = '.dmg'
|
|
1170
|
-
expect( subject ).to receive( :on ).with( machost, "cd #{ machost['working_dir'] }; curl -O #{ path }/#{ filename }#{ extension }" ).once
|
|
1170
|
+
expect( subject ).to receive( :on ).with( machost, "cd #{ machost['working_dir'] }; curl -L -O #{ path }/#{ filename }#{ extension }" ).once
|
|
1171
1171
|
subject.fetch_pe( [machost], {} )
|
|
1172
1172
|
end
|
|
1173
1173
|
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: beaker-pe
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.11.
|
|
4
|
+
version: 2.11.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Puppetlabs
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2020-
|
|
11
|
+
date: 2020-07-15 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rspec
|
|
@@ -248,6 +248,7 @@ executables:
|
|
|
248
248
|
extensions: []
|
|
249
249
|
extra_rdoc_files: []
|
|
250
250
|
files:
|
|
251
|
+
- ".github/dependabot.yml"
|
|
251
252
|
- ".gitignore"
|
|
252
253
|
- ".rspec"
|
|
253
254
|
- ".simplecov"
|
|
@@ -306,7 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
306
307
|
- !ruby/object:Gem::Version
|
|
307
308
|
version: '0'
|
|
308
309
|
requirements: []
|
|
309
|
-
rubygems_version: 3.0.
|
|
310
|
+
rubygems_version: 3.0.8
|
|
310
311
|
signing_key:
|
|
311
312
|
specification_version: 4
|
|
312
313
|
summary: Beaker PE DSL Helpers!
|