test-kitchen 2.5.4 → 2.6.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 +4 -4
- data/lib/kitchen/provisioner/chef_base.rb +16 -5
- data/lib/kitchen/version.rb +1 -1
- data/test-kitchen.gemspec +3 -3
- metadata +9 -9
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: fbc194fbd762658d4d989813aa6eb5aff36dda3859ee7d65eaf080fe033b1fad
|
4
|
+
data.tar.gz: f4afc61cf21085c167952eadae6867ffc242c616d283dbfdff8c7e87085d5dfb
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7278defbe363816e09a07eaa757bc7108d7e87bbbf93dc8f30e1d93d4eda5aebe2b5a826d817a8be20cd123ffaa917f890458568245860d8f0e7ae233428c38b
|
7
|
+
data.tar.gz: 509577b9063d96342cfd1491aeae633930ca88dbf18be3b2bee23145850ee8eba1fd8e8581fd11ce583216797eaf9d9f9dff78e8e38997c2f614ba3159a12e10
|
@@ -328,7 +328,7 @@ module Kitchen
|
|
328
328
|
return unless config[:require_chef_omnibus] || config[:product_name]
|
329
329
|
return if config[:product_name] && config[:install_strategy] == "skip"
|
330
330
|
|
331
|
-
prefix_command(
|
331
|
+
prefix_command(install_script_contents)
|
332
332
|
end
|
333
333
|
|
334
334
|
private
|
@@ -516,6 +516,12 @@ module Kitchen
|
|
516
516
|
opts[key] = config[key] if config[key]
|
517
517
|
end
|
518
518
|
|
519
|
+
unless windows_os?
|
520
|
+
# omnitruck installer does not currently support a tmp dir option on windows
|
521
|
+
opts[:install_command_options][:tmp_dir] = config[:root_path]
|
522
|
+
opts[:install_command_options]["TMPDIR"] = config[:root_path]
|
523
|
+
end
|
524
|
+
|
519
525
|
if config[:download_url]
|
520
526
|
opts[:install_command_options][:download_url_override] = config[:download_url]
|
521
527
|
opts[:install_command_options][:checksum] = config[:checksum] if config[:checksum]
|
@@ -534,7 +540,6 @@ module Kitchen
|
|
534
540
|
# install.ps1 only supports http_proxy
|
535
541
|
prox.delete_if { |p| %i{https_proxy ftp_proxy no_proxy}.include?(p) } if powershell_shell?
|
536
542
|
end
|
537
|
-
|
538
543
|
opts[:install_command_options].merge!(proxies)
|
539
544
|
end)
|
540
545
|
config[:chef_omnibus_root] = installer.root
|
@@ -553,8 +558,14 @@ module Kitchen
|
|
553
558
|
end
|
554
559
|
|
555
560
|
def install_from_file(command)
|
556
|
-
install_file = "/
|
557
|
-
script = [
|
561
|
+
install_file = "#{config[:root_path]}/chef-installer.sh"
|
562
|
+
script = []
|
563
|
+
script << "mkdir -p #{config[:root_path]}"
|
564
|
+
script << "if [ $? -ne 0 ]; then"
|
565
|
+
script << " echo Kitchen config setting root_path: '#{config[:root_path]}' not creatable by regular user "
|
566
|
+
script << " exit 1"
|
567
|
+
script << "fi"
|
568
|
+
script << "cat > #{install_file} <<\"EOL\""
|
558
569
|
script << command
|
559
570
|
script << "EOL"
|
560
571
|
script << "chmod +x #{install_file}"
|
@@ -569,7 +580,7 @@ module Kitchen
|
|
569
580
|
config[:require_chef_omnibus], powershell_shell?, install_options
|
570
581
|
)
|
571
582
|
config[:chef_omnibus_root] = installer.root
|
572
|
-
installer.install_command
|
583
|
+
sudo(installer.install_command)
|
573
584
|
end
|
574
585
|
|
575
586
|
# Hook used in subclasses to indicate support for policyfiles.
|
data/lib/kitchen/version.rb
CHANGED
data/test-kitchen.gemspec
CHANGED
@@ -15,12 +15,12 @@ Gem::Specification.new do |gem|
|
|
15
15
|
gem.summary = gem.description
|
16
16
|
gem.homepage = "https://kitchen.ci/"
|
17
17
|
|
18
|
-
# The gemfile and gemspec are necessary for appbundler in
|
18
|
+
# The gemfile and gemspec are necessary for appbundler in ChefDK / Workstation
|
19
19
|
gem.files = %w{LICENSE test-kitchen.gemspec Gemfile Rakefile} + Dir.glob("{bin,lib,templates,support}/**/*")
|
20
20
|
gem.executables = %w{kitchen}
|
21
21
|
gem.require_paths = ["lib"]
|
22
22
|
|
23
|
-
gem.required_ruby_version = ">= 2.
|
23
|
+
gem.required_ruby_version = ">= 2.4"
|
24
24
|
|
25
25
|
gem.add_dependency "mixlib-shellout", ">= 1.2", "< 4.0"
|
26
26
|
gem.add_dependency "net-scp", ">= 1.1", "< 4.0" # pinning until we can confirm 4+ works
|
@@ -35,7 +35,7 @@ Gem::Specification.new do |gem|
|
|
35
35
|
gem.add_dependency "winrm-fs", "~> 1.1"
|
36
36
|
# Required to run the Chef provisioner local license check for remote systems
|
37
37
|
# TK is not under Chef EULA
|
38
|
-
gem.add_dependency "license-acceptance", "
|
38
|
+
gem.add_dependency "license-acceptance", ">= 1.0.11", "< 3.0" # pinning until we can confirm 3+ works
|
39
39
|
|
40
40
|
gem.add_development_dependency "rb-readline"
|
41
41
|
gem.add_development_dependency "bundler"
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: test-kitchen
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.
|
4
|
+
version: 2.6.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Fletcher Nichol
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-08-13 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: mixlib-shellout
|
@@ -198,22 +198,22 @@ dependencies:
|
|
198
198
|
name: license-acceptance
|
199
199
|
requirement: !ruby/object:Gem::Requirement
|
200
200
|
requirements:
|
201
|
-
- - "~>"
|
202
|
-
- !ruby/object:Gem::Version
|
203
|
-
version: '1.0'
|
204
201
|
- - ">="
|
205
202
|
- !ruby/object:Gem::Version
|
206
203
|
version: 1.0.11
|
204
|
+
- - "<"
|
205
|
+
- !ruby/object:Gem::Version
|
206
|
+
version: '3.0'
|
207
207
|
type: :runtime
|
208
208
|
prerelease: false
|
209
209
|
version_requirements: !ruby/object:Gem::Requirement
|
210
210
|
requirements:
|
211
|
-
- - "~>"
|
212
|
-
- !ruby/object:Gem::Version
|
213
|
-
version: '1.0'
|
214
211
|
- - ">="
|
215
212
|
- !ruby/object:Gem::Version
|
216
213
|
version: 1.0.11
|
214
|
+
- - "<"
|
215
|
+
- !ruby/object:Gem::Version
|
216
|
+
version: '3.0'
|
217
217
|
- !ruby/object:Gem::Dependency
|
218
218
|
name: rb-readline
|
219
219
|
requirement: !ruby/object:Gem::Requirement
|
@@ -492,7 +492,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
492
492
|
requirements:
|
493
493
|
- - ">="
|
494
494
|
- !ruby/object:Gem::Version
|
495
|
-
version: '2.
|
495
|
+
version: '2.4'
|
496
496
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
497
497
|
requirements:
|
498
498
|
- - ">="
|