Merge pull request #532 from test-kitchen/github_actions

Signed-off-by: Tim Smith <[email protected]>

Author: tas50

.github/workflows/linters.yml

@@ -0,0 +1,30 @@
+---
+name: linters
+
+'on':
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  yamllint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@master
+      - name: Run yaml Lint
+        uses: actionshub/yamllint@main
+  chefstyle:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: ['2.5', '2.6', '2.7', '3.0']
+    name: Chefstyle on Ruby ${{ matrix.ruby }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rake style

.github/workflows/ci.yml .github/workflows/unit.yml

@@ -1,6 +1,7 @@
-name: CI
+---
+name: Unit
 
-on:
+'on':
   pull_request:
   push:
     branches:
@@ -11,12 +12,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ '2.5', '2.6', '2.7', '3.0']
-    name: Lint & Test with Ruby ${{ matrix.ruby }}
+        ruby: ['2.5', '2.6', '2.7', '3.0']
+    name: Unit test on Ruby ${{ matrix.ruby }}
     steps:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-      - run: bundle exec rake
+      - run: bundle exec rake test

.rubocop.yml

@@ -1,6 +1,7 @@
+---
 AllCops:
   TargetRubyVersion: 2.4
 
 Lint/IneffectiveAccessModifier:
   Exclude:
-    - lib/kitchen/driver/aws/standard_platform.rb
+    - lib/kitchen/driver/aws/standard_platform.rb

Gemfile

@@ -7,3 +7,7 @@ group :test do
   gem "rake"
   gem "pry"
 end
+
+group :chefstyle do
+  gem "chefstyle", "=1.5.9"
+end

Rakefile

@@ -2,24 +2,16 @@ require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:test)
 
-desc "Display LOC stats"
-task :stats do
-  puts "\n## Production Code Stats"
-  sh "countloc -r lib/kitchen lib/kitchen.rb"
-  puts "\n## Test Code Stats"
-  sh "countloc -r spec features"
-end
-
-require "chefstyle"
-require "rubocop/rake_task"
-RuboCop::RakeTask.new(:style) do |task|
-  task.options << "--display-cop-names"
+begin
+  require "chefstyle"
+  require "rubocop/rake_task"
+  RuboCop::RakeTask.new(:style) do |task|
+    task.options += ["--display-cop-names", "--no-color"]
+  end
+rescue LoadError
+  puts "chefstyle is not available. (sudo) gem install chefstyle to do style checking."
 end
 
 desc "Run all quality tasks"
-task quality: %i{style stats}
-
-require "yard" unless defined?(YARD)
-YARD::Rake::YardocTask.new
 
-task default: %i{test quality style}
+task default: %i{test style}

kitchen-ec2.gemspec

@@ -22,13 +22,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency "retryable", ">= 2.0", "< 4.0" # 4.0 will need to be validated
 
   gem.add_development_dependency "rspec",     "~> 3.2"
-  gem.add_development_dependency "countloc",  "~> 0.4"
   gem.add_development_dependency "maruku",    "~> 0.6"
-  gem.add_development_dependency "yard",      ">= 0.9.11"
-
-  # style and complexity libraries are tightly version pinned as newer releases
-  # may introduce new and undesireable style choices which would be immediately
-  # enforced in CI
-  gem.add_development_dependency "chefstyle", "= 1.5.9"
   gem.add_development_dependency "climate_control"
 end

lib/kitchen/driver/aws/standard_platform/debian.rb

@@ -23,8 +23,8 @@ class StandardPlatform
         class Debian < StandardPlatform
           StandardPlatform.platforms["debian"] = self
 
-          # 10/11 are listed last since we default to the first item in the hash
-          # and 10/11 are not released yet. When they're released move them up
+          # 11/12 are listed last since we default to the first item in the hash
+          # and 11/12 are not released yet. When they're released move them up
           DEBIAN_CODENAMES = {
             10 => "buster",
             9 => "stretch",

spec/kitchen/driver/aws/image_selection_spec.rb

@@ -24,6 +24,7 @@
     Kitchen::Driver::Ec2.new(region: "us-west-2", aws_ssh_key_id: "foo", **config)
   end
   let(:config) { {} }
+  let(:state_file) { {} }
   def new_instance(platform_name: "blarghle")
     Kitchen::Instance.new(
       driver: driver,
@@ -33,7 +34,7 @@ def new_instance(platform_name: "blarghle")
       transport: Kitchen::Transport::Dummy.new,
       verifier: Kitchen::Verifier::Dummy.new,
       state_file: Kitchen::StateFile.new("/nonexistent", "suite-name-#{platform_name}"),
-      lifecycle_hooks: Kitchen::LifecycleHooks.new({})
+      lifecycle_hooks: Kitchen::LifecycleHooks.new(config, state_file)
     )
   end
 
@@ -139,24 +140,11 @@ def new_instance(platform_name: "blarghle")
       { name: "owner-id", values: %w{379101102735} },
       { name: "name", values: %w{debian-jessie-*} },
     ],
-    "debian-7" => [
-      { name: "owner-id", values: %w{379101102735} },
-      { name: "name", values: %w{debian-wheezy-*} },
-    ],
-    "debian-6" => [
-      { name: "owner-id", values: %w{379101102735} },
-      { name: "name", values: %w{debian-squeeze-*} },
-    ],
     "debian-x86_64" => [
       { name: "owner-id", values: %w{379101102735} },
       { name: "name", values: %w{debian-buster-*} },
       { name: "architecture", values: %w{x86_64} },
     ],
-    "debian-6-x86_64" => [
-      { name: "owner-id", values: %w{379101102735} },
-      { name: "name", values: %w{debian-squeeze-*} },
-      { name: "architecture", values: %w{x86_64} },
-    ],
 
     "rhel" => [
       { name: "owner-id", values: %w{309956199498} },