Skip to content
This repository was archived by the owner on Jul 14, 2021. It is now read-only.

Commit 4a916bf

Browse files
authored
Merge pull request #1470 from chef/tk
Pull in the new Test Kitchen which allows for the latest winrm-fs
2 parents 03420bc + a1d5204 commit 4a916bf

File tree

3 files changed

+20
-21
lines changed

3 files changed

+20
-21
lines changed

Gemfile.lock

+13-13
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ GEM
195195
cheffish (13.1.0)
196196
chef-zero (~> 13.0)
197197
net-ssh
198-
chefspec (7.1.0)
198+
chefspec (7.1.1)
199199
chef (>= 12.14.89)
200200
fauxhai (>= 4, < 6)
201201
rspec (~> 3.0)
@@ -210,21 +210,21 @@ GEM
210210
mixlib-archive (~> 0.4)
211211
cookstyle (2.1.0)
212212
rubocop (= 0.49.1)
213-
cucumber (3.0.2)
213+
cucumber (3.1.0)
214214
builder (>= 2.1.2)
215-
cucumber-core (~> 3.0.0)
216-
cucumber-expressions (~> 4.0.3)
215+
cucumber-core (~> 3.1.0)
216+
cucumber-expressions (~> 5.0.4)
217217
cucumber-wire (~> 0.0.1)
218218
diff-lcs (~> 1.3)
219-
gherkin (~> 4.0)
219+
gherkin (~> 5.0)
220220
multi_json (>= 1.7.5, < 2.0)
221221
multi_test (>= 0.1.2)
222-
cucumber-core (3.0.0)
222+
cucumber-core (3.1.0)
223223
backports (>= 3.8.0)
224-
cucumber-tag_expressions (>= 1.0.1)
225-
gherkin (>= 4.1.3)
226-
cucumber-expressions (4.0.4)
227-
cucumber-tag_expressions (1.0.1)
224+
cucumber-tag_expressions (~> 1.1.0)
225+
gherkin (>= 5.0.0)
226+
cucumber-expressions (5.0.5)
227+
cucumber-tag_expressions (1.1.0)
228228
cucumber-wire (0.0.1)
229229
dco (1.0.1)
230230
git (~> 1.3)
@@ -318,7 +318,7 @@ GEM
318318
fuzzyurl (0.9.0)
319319
gcewinpass (1.0.0)
320320
google-api-client (~> 0.9.0)
321-
gherkin (4.1.3)
321+
gherkin (5.0.0)
322322
git (1.3.0)
323323
google-api-client (0.9.28)
324324
addressable (~> 2.3)
@@ -648,7 +648,7 @@ GEM
648648
uuid (~> 2.0)
649649
syslog-logger (1.6.8)
650650
systemu (2.6.5)
651-
test-kitchen (1.19.1)
651+
test-kitchen (1.19.2)
652652
mixlib-install (~> 3.6)
653653
mixlib-shellout (>= 1.2, < 3.0)
654654
net-scp (~> 1.1)
@@ -658,7 +658,7 @@ GEM
658658
thor (~> 0.19, < 0.19.2)
659659
winrm (~> 2.0)
660660
winrm-elevated (~> 1.0)
661-
winrm-fs (~> 1.0.2)
661+
winrm-fs (~> 1.1.0)
662662
thor (0.19.1)
663663
thread_safe (0.3.6)
664664
timers (4.0.4)

RELEASE_NOTES.md

+4-5
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,12 @@ The Chef Provisioning AWS gem has been updated from the Amazon AWS SDK V1 to V2.
105105
## Notable Updated Gems
106106

107107
- aws-sdk 2.10.45 -> 2.10.90
108-
- chef 13.4.19 - > 13.6.4 ([Changelog](https://github.com/chef/chef/blob/master/RELEASE_NOTES.md))
108+
- chef 13.4.19 -> 13.6.4 ([Changelog](https://github.com/chef/chef/blob/master/RELEASE_NOTES.md))
109+
- chefspec 7.1.0 -> 7.1.1 ([Changelog](https://github.com/chefspec/chefspec/blob/master/CHANGELOG.md)
109110
- chef-provisioning 2.5.0 -> 2.6.0 ([Changelog](https://github.com/chef/chef-provisioning/blob/master/CHANGELOG.md))
110111
- chef-provisioning-aws 2.2.2 -> 3.0.0 ([Changelog](https://github.com/chef/chef-provisioning-aws/blob/master/CHANGELOG.md))
111112
- chef-provisioning-fog 0.21.0 -> 0.26.0 ([Changelog](https://github.com/chef/chef-provisioning-fog/blob/master/CHANGELOG.md))
112113
- chef-sugar 3.5.0 -> 3.6.0 ([Changelog](https://github.com/sethvargo/chef-sugar/blob/master/CHANGELOG.md))
113-
- cucumber 2.4.0 -> 3.0.2 ([Changelog](https://github.com/cucumber/cucumber-ruby/blob/master/CHANGELOG.md))
114114
- fauxhai 5.3.0 -> 5.5.0 ([Changelog](https://github.com/chefspec/fauxhai/blob/master/CHANGELOG.md))
115115
- foodcritic 11.4.0 -> 12.2.1 ([Changelog](https://github.com/Foodcritic/foodcritic/blob/master/CHANGELOG.md))
116116
- inspec 1.36.1 -> 1.44.13 ([Changelog](https://github.com/chef/inspec/blob/master/CHANGELOG.md))
@@ -121,12 +121,11 @@ The Chef Provisioning AWS gem has been updated from the Amazon AWS SDK V1 to V2.
121121
- knife-google new @ 3.2.0
122122
- knife-spork 1.6.3 -> 1.7.1 ([Changelog](https://github.com/jonlives/knife-spork/blob/master/CHANGELOG.md))
123123
- mixlib-install 2.1.12 -> 3.8.0 ([Changelog](https://github.com/chef/mixlib-install/blob/master/CHANGELOG.md))
124-
- rake 12.1.0 -> 12.3.0 ([Changelog](https://github.com/ruby/rake/blob/master/History.rdoc))
125124
- rspec 3.6.0 -> 3.7.0 ([Changelog](https://github.com/rspec/rspec-core/blob/master/Changelog.md))
126125
- serverspec 2.40.0 -> 2.41.3
127-
- test-kitchen 1.17.0 -> 1.19.1 ([Changelog](https://github.com/test-kitchen/test-kitchen/blob/master/CHANGELOG.md))
126+
- test-kitchen 1.17.0 -> 1.19.2 ([Changelog](https://github.com/test-kitchen/test-kitchen/blob/master/CHANGELOG.md))
128127
- train 0.26.2 -> 0.29.2 ([Changelog](https://github.com/chef/train/blob/master/CHANGELOG.md))
129-
- winrm-fs 1.0.1 -> winrm-fs 1.1.0 ([Changelog](https://github.com/WinRb/winrm-fs/blob/master/changelog.md))
128+
- winrm-fs 1.0.1 -> winrm-fs 1.1.1 ([Changelog](https://github.com/WinRb/winrm-fs/blob/master/changelog.md))
130129

131130

132131
# ChefDK 2.3 Release Notes

omnibus/Gemfile.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ GEM
301301
sfl
302302
syslog-logger (1.6.8)
303303
systemu (2.6.5)
304-
test-kitchen (1.19.1)
304+
test-kitchen (1.19.2)
305305
mixlib-install (~> 3.6)
306306
mixlib-shellout (>= 1.2, < 3.0)
307307
net-scp (~> 1.1)
@@ -311,7 +311,7 @@ GEM
311311
thor (~> 0.19, < 0.19.2)
312312
winrm (~> 2.0)
313313
winrm-elevated (~> 1.0)
314-
winrm-fs (~> 1.0.2)
314+
winrm-fs (~> 1.1.0)
315315
thor (0.19.1)
316316
timers (4.0.4)
317317
hitimes
@@ -351,7 +351,7 @@ GEM
351351
winrm-elevated (1.1.0)
352352
winrm (~> 2.0)
353353
winrm-fs (~> 1.0)
354-
winrm-fs (1.0.2)
354+
winrm-fs (1.1.1)
355355
erubis (~> 2.7)
356356
logging (>= 1.6.1, < 3.0)
357357
rubyzip (~> 1.1)

0 commit comments

Comments
 (0)