From 22d4b006e705820cd7302e158d65c987a54d6416 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Tue, 28 Feb 2017 20:51:19 -0800 Subject: [PATCH] Test with Local Delivery instead of Rake Signed-off-by: Tim Smith --- .delivery/project.toml | 1 + .gitignore | 6 ++-- .kitchen.yml | 3 +- .travis.yml | 2 +- Rakefile | 67 ------------------------------------------ 5 files changed, 7 insertions(+), 72 deletions(-) create mode 100644 .delivery/project.toml delete mode 100644 Rakefile diff --git a/.delivery/project.toml b/.delivery/project.toml new file mode 100644 index 0000000..6d5e361 --- /dev/null +++ b/.delivery/project.toml @@ -0,0 +1 @@ +remote_file = "https://raw.githubusercontent.com/chef-cookbooks/community_cookbook_tools/master/delivery/project.toml" diff --git a/.gitignore b/.gitignore index cde9201..abdff6a 100644 --- a/.gitignore +++ b/.gitignore @@ -34,7 +34,7 @@ _yardoc doc/ .idea -#chef stuff +# chef stuff Berksfile.lock .kitchen .kitchen.local.yml @@ -42,8 +42,10 @@ vendor/ .coverage/ .zero-knife.rb Policyfile.lock.json +Cheffile.lock +.librarian/ -#vagrant stuff +# vagrant stuff .vagrant/ .vagrant.d/ .kitchen/ diff --git a/.kitchen.yml b/.kitchen.yml index d865f00..65d9967 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -13,10 +13,9 @@ platforms: - name: centos-7.3 - name: debian-7.11 - name: debian-8.6 - - name: freebsd-9.3 - name: freebsd-10.3 + - name: freebsd-11.0 - name: fedora-25 - - name: opensuse-13.2 - name: opensuse-leap-42.2 - name: ubuntu-14.04 - name: ubuntu-16.04 diff --git a/.travis.yml b/.travis.yml index 37a7f73..511fe73 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,4 +24,4 @@ script: - /opt/chefdk/embedded/bin/chef --version - /opt/chefdk/embedded/bin/cookstyle --version - /opt/chefdk/embedded/bin/foodcritic --version - - /opt/chefdk/bin/chef exec rake + - /opt/chefdk/bin/chef exec delivery local all diff --git a/Rakefile b/Rakefile deleted file mode 100644 index 5b08262..0000000 --- a/Rakefile +++ /dev/null @@ -1,67 +0,0 @@ -#!/usr/bin/env rake - -require_relative 'tasks/maintainers' - -# Style tests. cookstyle (rubocop) and Foodcritic -namespace :style do - begin - require 'cookstyle' - require 'rubocop/rake_task' - - desc 'Run Ruby style checks' - RuboCop::RakeTask.new(:ruby) - rescue LoadError => e - puts ">>> Gem load error: #{e}, omitting #{task.name}" unless ENV['CI'] - end - - begin - require 'foodcritic' - - desc 'Run Chef style checks' - FoodCritic::Rake::LintTask.new(:chef) do |t| - t.options = { - fail_tags: ['any'], - progress: true, - } - end - rescue LoadError - puts ">>> Gem load error: #{e}, omitting #{task.name}" unless ENV['CI'] - end -end - -desc 'Run all style checks' -task style: ['style:chef', 'style:ruby'] - -# ChefSpec -begin - desc 'Run ChefSpec examples' - require 'rspec/core/rake_task' - RSpec::Core::RakeTask.new(:spec) -rescue LoadError => e - puts ">>> Gem load error: #{e}, omitting #{task.name}" unless ENV['CI'] -end - -# Integration tests. Kitchen.ci -namespace :integration do - begin - require 'kitchen/rake_tasks' - - desc 'Run kitchen integration tests' - Kitchen::RakeTasks.new - rescue StandardError => e - puts ">>> Gem load error: #{e}, omitting #{task.name}" unless ENV['CI'] - end -end - -namespace :supermarket do - begin - desc 'Publish cookbook to Supermarket with Stove' - require 'stove/rake_task' - Stove::RakeTask.new - rescue LoadError => e - puts ">>> Gem load error: #{e}, omitting #{task.name}" unless ENV['CI'] - end -end - -# Default -task default: %w(style spec)