dnf compat at compile time + other updates

Convert to cookstyle
Update deps
Use the latest in kitchen dokken
Test on Fedora 23 not 22
Signed-off-by: default avatarTim Smith <tsmith@chef.io>
parent 381655fe
driver:
name: dokken
chef_version: 12.6.0
chef_version: latest
privileged: true # because Docker and SystemD/Upstart
transport:
name: dokken
......@@ -25,9 +26,9 @@ platforms:
driver:
image: centos:7
- name: fedora-22
- name: fedora-23
driver:
image: fedora:22
image: fedora:23
suites:
- name: default
......@@ -38,4 +39,4 @@ suites:
run_list:
- recipe[yum::dnf_yum_compat]
- recipe[yum_test::test_dnf_compat]
includes: fedora-22
includes: fedora-23
......@@ -8,7 +8,7 @@ platforms:
- name: centos-5.11
- name: centos-6.7
- name: centos-7.2
- name: fedora-22
- name: fedora-23
suites:
- name: default
......@@ -19,4 +19,4 @@ suites:
run_list:
- recipe[yum::dnf_yum_compat]
- recipe[yum_test::test_dnf_compat]
includes: fedora-22
includes: fedora-23
sudo: required
dist: trusty
# install the pre-release chef-dk. Use chef-stable-precise to install the stable release
addons:
......@@ -8,6 +9,8 @@ addons:
packages:
- chefdk
install: echo "skip bundle install"
services: docker
env:
......@@ -15,25 +18,20 @@ env:
- INSTANCE=default-centos-5
- INSTANCE=default-centos-6
- INSTANCE=default-centos-7
- INSTANCE=default-fedora-22
- INSTANCE=dnf-compat-fedora-22
- INSTANCE=default-fedora-23
- INSTANCE=dnf-compat-fedora-23
# Don't `bundle install`
install: echo "skip bundle install"
fast_finish: true
# Ensure we make ChefDK's Ruby the default
before_script:
# https://github.com/zuazo/kitchen-in-travis-native/issues/1#issuecomment-142230889
- docker version
- docker info
- mount
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- eval "$(/opt/chefdk/bin/chef shell-init bash)"
- /opt/chefdk/embedded/bin/chef gem install kitchen-dokken
script:
- /opt/chefdk/embedded/bin/chef --version
- /opt/chefdk/embedded/bin/rubocop --version
- /opt/chefdk/embedded/bin/rubocop
- /opt/chefdk/embedded/bin/cookstyle --version
- /opt/chefdk/embedded/bin/cookstyle
- /opt/chefdk/embedded/bin/foodcritic --version
- /opt/chefdk/embedded/bin/foodcritic . --exclude spec -f any
- /opt/chefdk/embedded/bin/rspec
......
source 'https://rubygems.org'
group :rake do
gem 'rake'
gem 'tomlrb'
end
group :lint do
gem 'foodcritic', '~> 6.0'
gem 'rubocop', '~> 0.38'
end
group :unit do
gem 'berkshelf', '~> 4.3'
gem 'chefspec', '~> 4.6'
end
group :kitchen_common do
gem 'test-kitchen', '~> 1.6'
end
group :kitchen_vagrant do
gem 'kitchen-vagrant', '~> 0.19'
end
group :kitchen_inspec do
gem 'kitchen-inspec'
end
gem 'berkshelf', '~> 4.3'
gem 'chefspec', '~> 4.6'
gem 'cookstyle'
gem 'foodcritic', '~> 6.2'
gem 'kitchen-dokken'
gem 'kitchen-inspec', '~> 0.12'
gem 'kitchen-vagrant', '~> 0.20'
gem 'rake'
gem 'stove'
gem 'test-kitchen', '~> 1.7'
gem 'tomlrb'
......@@ -19,7 +19,7 @@ for details on the process and how to become a maintainer or the project lead.
[Org.Components.Core]
title = "Project Maintainer"
lieutenant = 'someara'
lieutenant = 'tas50'
maintainers = [
'sigje',
......
require 'rspec/core/rake_task'
require 'cookstyle'
require 'rubocop/rake_task'
require 'foodcritic'
require 'kitchen'
......
......@@ -2,7 +2,7 @@
# Author:: Tim Smith (<tsmith@chef.io>)
# Recipe:: yum::fedora_yum_compat
#
# Copyright 2015, Chef Software, Inc (<legal@chef.io>)
# Copyright 2015-2016, Chef Software, Inc (<legal@chef.io>)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
......@@ -19,5 +19,5 @@
execute 'install yum' do
command 'dnf install yum -y'
not_if { ::File.exist?('/var/lib/yum') }
action :run
end
action :nothing
end.run_action(:run)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment