Merge pull request #4074 from inspec/tk_cleanup

Cleanup and fix failing Kitchen tests

.travis.yml

@@ -18,7 +18,7 @@ matrix:
     env: UNIT_TESTS_24=1
   - rvm: 2.5.5
     env: UNIT_TESTS_25=1
-  - rvm: 2.6.2
+  - rvm: 2.6.3
     env: UNIT_TESTS_26=1
   - rvm: 2.4.5
     script: bundle exec rake $SUITE
@@ -53,6 +53,10 @@ matrix:
     script: bundle exec rake $SUITE
     bundler_args: "--without tools maintenance deploy"
     env: SUITE=test:integration[default-debian-9]
+  - rvm: 2.5.5
+    script: bundle exec rake $SUITE
+    bundler_args: "--without tools maintenance deploy"
+    env: SUITE=test:integration[default-debian-10]
   - rvm: 2.5.5
     script: bundle exec rake $SUITE
     bundler_args: "--without tools maintenance deploy"

Gemfile

@@ -36,7 +36,7 @@ end
 
 group :integration do
   gem 'berkshelf', '~> 7'
-  gem 'test-kitchen', '>= 1.24'
+  gem 'test-kitchen', '~> 1.17'
   gem 'kitchen-vagrant'
   # we need winrm v2 support >= 0.15.1
   gem 'kitchen-inspec', '>= 0.15.1'

kitchen.ec2.yml

@@ -1,87 +0,0 @@
-driver:
-  name: ec2
-  region: eu-central-1
-  instance_type: m3.medium
-  associate_public_ip: true
-  security_group_ids: ["travis-ci"]
-  interface: dns
-  tags:
-    Name: kitchen-test-inspec
-
-transport:
-  username: ec2-user
-  ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>
-
-provisioner:
-  name: chef_solo
-
-verifier:
-  name: inspec
-  sudo: true
-
-platforms:
-  - name: windows-2008
-    driver:
-      image_id: ami-58918e34
-    transport:
-      username: administrator
-  - name: windows-2012
-    driver:
-      image_id: ami-44918e28
-    transport:
-      username: administrator
-  - name: windows-2012r2
-    driver:
-      image_id: ami-8a918ee6
-    transport:
-      username: administrator
-  - name: suse-11sp3
-    driver:
-      image_id: ami-fc0033e1
-  - name: suse-12
-    driver:
-      image_id: ami-a22610bf
-  - name: redhat-65
-    driver:
-      image_id: ami-008ebf1d
-  - name: redhat-71
-    driver:
-      image_id: ami-dafdcfc7
-  - name: ubuntu-1204
-    driver:
-      image_id: ami-24232f39
-    transport:
-      username: ubuntu
-  - name: ubuntu-1404
-    driver:
-      image_id: ami-48272b55
-    transport:
-      username: ubuntu
-  - name: ubuntu-1510
-    driver:
-      image_id: ami-1b4a5977
-    transport:
-      username: ubuntu
-  - name: fedora-22
-    driver:
-      image_id: ami-a88eb0b5
-    transport:
-      username: fedora
-  - name: debian-8
-    driver:
-      image_id: ami-b092aaad
-    transport:
-      username: admin
-  - name: centos-7
-    driver:
-      image_id: ami-e68f82fb
-    transport:
-      username: centos
-  - name: aws-linux
-    driver:
-      image_id: ami-daaeaec7
-
-suites:
-  - name: default
-    run_list:
-      - recipe[os_prepare]

kitchen.vagrant.yml

@@ -18,6 +18,7 @@ platforms:
   - name: fedora-29
   - name: freebsd-11
   - name: opensuseleap-42
+  - name: opensuseleap-15
   - name: ubuntu-16.04
   - name: ubuntu-18.04
 

kitchen.yml

@@ -1,7 +1,7 @@
 ---
 driver:
   name: dokken
-  chef_version: 14.10.9
+  chef_version: 14.12.9
   privileged: true # because Docker and SystemD/Upstart
 
 transport:
@@ -56,6 +56,13 @@ platforms:
     intermediate_instructions:
       - RUN /usr/bin/apt-get update -y
 
+- name: debian-10
+  driver:
+    image: dokken/debian-10
+    pid_one_command: /bin/systemd
+    intermediate_instructions:
+      - RUN /usr/bin/apt-get update -y
+
 - name: fedora-29
   driver:
     image: dokken/fedora-29
@@ -76,13 +83,6 @@ platforms:
     image: dokken/opensuse-leap-42
     pid_one_command: /bin/systemd
 
-- name: ubuntu-14.04
-  driver:
-    image: dokken/ubuntu-14.04
-    pid_one_command: /sbin/init
-    intermediate_instructions:
-      - RUN /usr/bin/apt-get update -y
-
 - name: ubuntu-16.04
   driver:
     image: dokken/ubuntu-16.04