Skip to content

Commit

Permalink
Cookstyle fixes
Browse files Browse the repository at this point in the history
Signed-off-by: Tim Smith <[email protected]>
  • Loading branch information
tas50 committed Oct 30, 2019
1 parent 39fb7ba commit f42c64e
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 7 deletions.
3 changes: 0 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ addons:
packages:
- chef-workstation

# Don't `bundle install` which takes about 1.5 mins
install: echo "skip bundle install"

env:
Expand All @@ -28,8 +27,6 @@ before_script:
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- eval "$(chef shell-init bash)"
- chef --version
- cookstyle --version
- foodcritic --version

script: KITCHEN_LOCAL_YAML=kitchen.dokken.yml kitchen verify ${INSTANCE}

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This gemfile provides additional gems for testing and releasing this cookbook
# It is meant to be installed on top of ChefDK which provides the majority
# It is meant to be installed on top of ChefDK / Chef Workstation which provide the majority
# of the necessary gems for testing this cookbook
#
# Run 'chef exec bundle install' to install these dependencies
Expand Down
1 change: 1 addition & 0 deletions kitchen.dokken.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ driver:
name: dokken
privileged: true # because Docker and SystemD/Upstart
chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>
chef_license: accept-no-persist

transport:
name: dokken
Expand Down
3 changes: 1 addition & 2 deletions metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
maintainer_email '[email protected]'
license 'Apache-2.0'
description 'Installs and configures the EPEL Yum repository'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '3.3.0'

%w(amazon centos oracle redhat scientific zlinux).each do |os|
Expand All @@ -12,4 +11,4 @@

source_url 'https://github.com/chef-cookbooks/yum-epel'
issues_url 'https://github.com/chef-cookbooks/yum-epel/issues'
chef_version '>= 12.14' if respond_to?(:chef_version)
chef_version '>= 12.14'
2 changes: 1 addition & 1 deletion recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Cookbook:: yum-epel
# Recipe:: default
#
# Copyright:: 2013-2017, Chef Software, Inc.
# Copyright:: 2013-2019, Chef Software, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down

0 comments on commit f42c64e

Please sign in to comment.