Skip to content

Commit

Permalink
Update testing files
Browse files Browse the repository at this point in the history
  • Loading branch information
tas50 committed Apr 19, 2016
1 parent 7ec3a24 commit d443cc5
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 24 deletions.
13 changes: 8 additions & 5 deletions .kitchen.yml
Expand Up @@ -5,14 +5,17 @@ provisioner:
name: chef_zero

platforms:
- name: centos-5.11
- name: centos-6.7
- name: centos-7.1
- name: debian-7.8
- name: centos-7.2
- name: debian-7.9
run_list: apt::default
- name: debian-8.1
- name: debian-8.2
run_list: apt::default
- name: fedora-21
- name: fedora-22
run_list: yum::dnf_yum_compat
- name: fedora-23
run_list: yum::dnf_yum_compat
- name: ubuntu-12.04
run_list: apt::default
- name: ubuntu-14.04
Expand All @@ -21,4 +24,4 @@ platforms:
suites:
- name: default
run_list:
- recipe[heartbeat::default]
- recipe[heartbeat::default]
10 changes: 6 additions & 4 deletions .rubocop.yml
Expand Up @@ -15,17 +15,19 @@ Encoding:
Enabled: false
Style/FileName:
Enabled: false
Style/Alias:
Enabled: false
Style/SpaceBeforeFirstArg:
Enabled: false
LineLength:
Enabled: false
MethodLength:
Enabled: false
Metrics/AbcSize:
Enabled: false
PerceivedComplexity:
Metrics/ModuleLength:
Enabled: false
Style/SpaceBeforeFirstArg:
PerceivedComplexity:
Enabled: false
Style/ClassAndModuleChildren:
Enabled: false
Style/FileName:
Enabled: false
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -31,6 +31,6 @@ script:
- /opt/chefdk/embedded/bin/rubocop --version
- /opt/chefdk/embedded/bin/rubocop
- /opt/chefdk/embedded/bin/foodcritic --version
- /opt/chefdk/embedded/bin/foodcritic . --exclude spec
- /opt/chefdk/embedded/bin/foodcritic . --exclude spec -f any
- /opt/chefdk/embedded/bin/rspec
- KITCHEN_LOCAL_YAML=.kitchen.docker.yml /opt/chefdk/embedded/bin/kitchen verify ${INSTANCE}
1 change: 1 addition & 0 deletions Berksfile
Expand Up @@ -3,5 +3,6 @@ source 'https://supermarket.chef.io'
metadata

group :integration do
cookbook 'yum'
cookbook 'apt'
end
17 changes: 6 additions & 11 deletions Gemfile
Expand Up @@ -6,24 +6,19 @@ group :rake do
end

group :lint do
gem 'foodcritic', '~> 5.0'
gem 'rubocop', '~> 0.34'
gem 'foodcritic', '~> 6.0'
gem 'rubocop', '~> 0.38'
end

group :unit do
gem 'berkshelf', '~> 4.0'
gem 'chefspec', '~> 4.4'
gem 'berkshelf', '~> 4.3'
gem 'chefspec', '~> 4.6'
end

group :kitchen_common do
gem 'test-kitchen', '~> 1.4'
gem 'test-kitchen', '~> 1.7'
end

group :kitchen_vagrant do
gem 'kitchen-vagrant', '~> 0.19'
end

group :kitchen_cloud do
gem 'kitchen-digitalocean'
gem 'kitchen-ec2'
gem 'kitchen-vagrant', '~> 0.20'
end
5 changes: 2 additions & 3 deletions Rakefile
Expand Up @@ -13,8 +13,7 @@ namespace :style do
desc 'Run Chef style checks'
FoodCritic::Rake::LintTask.new(:chef) do |t|
t.options = {
fail_tags: ['any'],
tags: ['~FC005']
fail_tags: ['any']
}
end
end
Expand All @@ -41,4 +40,4 @@ desc 'Run all tests on Travis'
task travis: ['style', 'spec', 'integration:cloud']

# Default
task default: ['style', 'spec', 'integration:vagrant']
task default: %w(style spec)

0 comments on commit d443cc5

Please sign in to comment.