Clean up integration tests, tasks

Author: 4-20ma

.kitchen.docker.yml renamed to .kitchen.travis.yml

@@ -5,7 +5,7 @@ driver:
 
 platforms:
   - name: centos-6
-  # - name: centos-7
+  - name: centos-7
 
 suites:
   - name: docker-integration-test

.travis.yml

@@ -9,5 +9,5 @@ cache: bundler
 bundler_args: --without development
 
 script:
-  - export KITCHEN_YAML=.kitchen.docker.yml
+  - export KITCHEN_YAML=.kitchen.travis.yml
   - travis_retry bundle exec rake travis

Rakefile

@@ -14,7 +14,7 @@ Dir.glob(File.join(__dir__, 'tasks', '**', '*.rb'), &method(:require))
 
 #----------------------------------------------------------------------- tasks
 desc 'Run all tests on Travis'
-task :travis => %w(style spec integration:docker)
+task :travis => %w(style spec integration:travis)
 
 # Default
 task :default => %w(style spec)

tasks/integration.rb

@@ -22,7 +22,6 @@
 require 'rake'
 
 #----------------------------------------------------------- integration tests
-# # TODO: from sudo cookboook:
 # Integration tests. Kitchen.ci
 namespace :integration do
   begin
@@ -31,10 +30,9 @@
     desc 'Run Test Kitchen integration tests with Docker'
     task :docker do
       Kitchen.logger = Kitchen.default_file_logger
-      # loader_config = { :project_config => ENV["KITCHEN_YAML"] }
       config = {
         :loader => Kitchen::Loader::YAML.new(:project_config =>
-        ENV['KITCHEN_YAML'] || '.kitchen.local.yml')
+          ENV['KITCHEN_YAML'] || '.kitchen.local.yml')
       }
       Kitchen::Config.new(config).instances.each do |instance|
         instance.test(:always)
@@ -45,7 +43,7 @@
   end
 end
 
-task :integration => %w(integration:docker)
+task :integration => %w(integration:local)
 
 # where
 # integration:cloud
@@ -56,44 +54,3 @@
 # integration:docker
 # integration:vagrant
 # integration:parallels
-
-
-# desc 'Run Test Kitchen integration tests'
-# namespace :integration do
-#   # Gets a collection of instances.
-#   #
-#   # @param regexp [String] regular expression to match against instance names.
-#   # @param config [Hash] configuration values for the `Kitchen::Config` class.
-#   # @return [Collection<Instance>] all instances.
-#   def kitchen_instances(regexp, config)
-#     instances = Kitchen::Config.new(config).instances
-#     return instances if regexp.nil? || regexp == 'all'
-#     instances.get_all(Regexp.new(regexp))
-#   end
-#
-#   # Runs a test kitchen action against some instances.
-#   #
-#   # @param action [String] kitchen action to run (defaults to `'test'`).
-#   # @param regexp [String] regular expression to match against instance names.
-#   # @param loader_config [Hash] loader configuration options.
-#   # @return void
-#   def run_kitchen(action, regexp, loader_config = {})
-#     action = 'test' if action.nil?
-#     require 'kitchen'
-#     Kitchen.logger = Kitchen.default_file_logger
-#     config = { loader: Kitchen::Loader::YAML.new(loader_config) }
-#     kitchen_instances(regexp, config).each { |i| i.send(action) }
-#   end
-#
-#   desc 'Run integration tests with kitchen-vagrant'
-#   task :vagrant, [:regexp, :action] do |_t, args|
-#     run_kitchen(args.action, args.regexp)
-#   end
-#
-#   desc 'Run integration tests with kitchen-docker'
-#   task :docker, [:regexp, :action] do |_t, args|
-#     run_kitchen(args.action, args.regexp, local_config: '.kitchen.docker.yml')
-#   end
-# end
-#
-# task default: %w(integration:vagrant)