test-kitchen 2.7.0 → 2.7.1
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 +5 -3
- data/lib/kitchen/provisioner/chef_solo.rb +4 -0
- data/lib/kitchen/ssh.rb +5 -2
- data/lib/kitchen/state_file.rb +1 -1
- data/lib/kitchen/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 6ae69102eac88b3cbb40ad7e39b02fd2a1519e8f9ed9d114fa1c0d4c0ea7319d
|
4
|
+
data.tar.gz: 48bf850ca5c79fcb0b7af6cc7fce89b05d1c735ad51c80e224285c50581576bd
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 9164957f96d9e93b04a4a9e32ac475d9b0e239f1e900d02660fa286d4625e312f7d1b47ab5cfa7136b91e514e826f6c915fb9dcc8a56677915714ce9106b6366
|
7
|
+
data.tar.gz: 3a0968bbe24c08505b12c8bfe3900c450c5f00bc35c3821db18b3535a891256ac9093f2f472a02bcbc7179d0b24f0c87f3a8237e185e87d39b0d741c98629738
|
@@ -24,9 +24,9 @@ require_relative "chef/policyfile"
|
|
24
24
|
require_relative "chef/berkshelf"
|
25
25
|
require_relative "chef/common_sandbox"
|
26
26
|
require_relative "../util"
|
27
|
-
|
28
|
-
|
29
|
-
|
27
|
+
module LicenseAcceptance
|
28
|
+
autoload :Acceptor, "license_acceptance/acceptor"
|
29
|
+
end
|
30
30
|
|
31
31
|
begin
|
32
32
|
require "chef-config/config"
|
@@ -503,6 +503,7 @@ module Kitchen
|
|
503
503
|
# @return [String] contents of product based install script
|
504
504
|
# @api private
|
505
505
|
def script_for_product
|
506
|
+
require "mixlib/install"
|
506
507
|
installer = Mixlib::Install.new({
|
507
508
|
product_name: config[:product_name],
|
508
509
|
product_version: config[:product_version],
|
@@ -576,6 +577,7 @@ module Kitchen
|
|
576
577
|
# @return [String] contents of version based install script
|
577
578
|
# @api private
|
578
579
|
def script_for_omnibus_version
|
580
|
+
require "mixlib/install/script_generator"
|
579
581
|
installer = Mixlib::Install::ScriptGenerator.new(
|
580
582
|
config[:require_chef_omnibus], powershell_shell?, install_options
|
581
583
|
)
|
@@ -27,6 +27,10 @@ module Kitchen
|
|
27
27
|
|
28
28
|
plugin_version Kitchen::VERSION
|
29
29
|
|
30
|
+
# ChefSolo is dependent on Berkshelf, which is not thread-safe.
|
31
|
+
# See discussion on https://github.com/test-kitchen/test-kitchen/issues/1307
|
32
|
+
no_parallel_for :converge
|
33
|
+
|
30
34
|
default_config :solo_rb, {}
|
31
35
|
|
32
36
|
default_config :chef_solo_path do |provisioner|
|
data/lib/kitchen/ssh.rb
CHANGED
@@ -16,8 +16,9 @@
|
|
16
16
|
# limitations under the License.
|
17
17
|
|
18
18
|
require "logger"
|
19
|
-
|
20
|
-
|
19
|
+
module Net
|
20
|
+
autoload :SSH, "net/ssh"
|
21
|
+
end
|
21
22
|
require "socket" unless defined?(Socket)
|
22
23
|
|
23
24
|
require_relative "errors"
|
@@ -90,6 +91,7 @@ module Kitchen
|
|
90
91
|
# `Net::SCP.upload`
|
91
92
|
# @see http://net-ssh.github.io/net-scp/classes/Net/SCP.html#method-i-upload
|
92
93
|
def upload!(local, remote, options = {}, &progress)
|
94
|
+
require "net/scp" unless defined?(Net::SCP)
|
93
95
|
if progress.nil?
|
94
96
|
progress = lambda do |_ch, name, sent, total|
|
95
97
|
logger.debug("Uploaded #{name} (#{total} bytes)") if sent == total
|
@@ -100,6 +102,7 @@ module Kitchen
|
|
100
102
|
end
|
101
103
|
|
102
104
|
def upload(local, remote, options = {}, &progress)
|
105
|
+
require "net/scp" unless defined?(Net::SCP)
|
103
106
|
if progress.nil?
|
104
107
|
progress = lambda do |_ch, name, sent, total|
|
105
108
|
if sent == total
|
data/lib/kitchen/state_file.rb
CHANGED
@@ -15,7 +15,7 @@
|
|
15
15
|
# See the License for the specific language governing permissions and
|
16
16
|
# limitations under the License.
|
17
17
|
|
18
|
-
|
18
|
+
autoload :YAML, "yaml"
|
19
19
|
|
20
20
|
module Kitchen
|
21
21
|
# Exception class for any exceptions raised when reading and parsing a state
|
data/lib/kitchen/version.rb
CHANGED
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.7.
|
4
|
+
version: 2.7.1
|
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-09-
|
11
|
+
date: 2020-09-15 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: mixlib-shellout
|