Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update for Chef 17 #93

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update for Chef 17 #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e38a39f
update a bunch of gems, try to use newer chef, cookstyle instead of f…
b-dean Jun 23, 2021
508b2d9
add failing test for chef 17
b-dean Jun 24, 2021
065e1d4
Work around rspec vs minitest versions of describe
b-dean Jun 28, 2021
a90dc3a
require at least chef 14
b-dean Jun 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Encoding:
Style/Encoding:
Enabled: false
LineLength:
Layout/LineLength:
Max: 100
MethodLength:
Metrics/MethodLength:
Max: 50
HashSyntax:
Style/HashSyntax:
Enabled: false

Metrics/ModuleLength:
Expand Down
13 changes: 8 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
# Use Travis's cointainer based infrastructure
language: ruby
rvm:
- 2.1.1
- 3.0.1
sudo: false
cache: bundler
addons:
apt:
sources:
- chef-stable-precise
- chef-current-xenial
packages:
- chefdk
- chef-workstation

# Ensure we make ChefDK's Ruby the default
env:
- CHEF_LICENSE=accept

# Ensure we make Chef Workstation's Ruby the default
before_script:
- eval "$(/opt/chefdk/bin/chef shell-init bash)"
- eval "$(chef shell-init bash)"
- chef exec bundle install
script:
- chef --version
Expand Down
5 changes: 0 additions & 5 deletions Berksfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,5 @@ DEPENDENCIES
GRAPH
chef_handler (2.1.1)
minitest-handler (1.5.1)
chef_handler (>= 0.0.0)
minitest-handler_test1 (0.0.1)
chef_handler (>= 0.0.0)
minitest-handler (>= 0.0.0)
minitest-handler_test2 (0.0.1)
chef_handler (>= 0.0.0)
minitest-handler (>= 0.0.0)
21 changes: 10 additions & 11 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
source 'https://rubygems.org'

gem 'berkshelf', '~> 5.6'
gem 'chefspec', '~> 6.2'
gem 'rubocop', '= 0.34.2'
gem 'foodcritic', '~> 10.3'
gem 'berkshelf', '~> 7.2'
gem 'chefspec', '~> 9.3'
gem 'rubocop', '~> 1.15'
gem 'cookstyle', '~> 7.13'
gem 'stove'

group :kitchen do
gem 'test-kitchen', '~> 1.4', '>= 1.4.2'
gem 'kitchen-vagrant', '~> 0.19.0'
gem 'kitchen-digitalocean', '~> 0.9.3'
gem 'kitchen-docker', '~> 2.3'
gem 'kitchen-openstack', '~> 2.1'
gem 'winrm-transport', '~> 1.0', '>= 1.0.2'
gem 'test-kitchen', '~> 2.12'
gem 'kitchen-vagrant', '~> 1.8'
gem 'kitchen-digitalocean', '~> 0.12.0'
gem 'kitchen-docker', '~> 2.10'
gem 'kitchen-openstack', '~> 6.0'
end

group :integration do
gem 'rake'
gem 'minitest', '~> 4.7.0', '>= 4.7.5'
gem 'busser-bats'
gem 'minitest-chef-handler', '~> 1.0.0', '>= 1.0.3'
gem 'minitest-chef-handler', '~> 1.1'
end
Loading