Merge pull request #323 from test-kitchen/tas50/amazon

Add support for Amazon Linux

.gitignore

@@ -17,3 +17,4 @@ test/version_tmp
 tmp
 .kitchen/
 .kitchen.local.yml
+Dockerfile*

.kitchen.yml

@@ -10,16 +10,19 @@ provisioner:
   name: dummy
 
 platforms:
-- name: ubuntu-14.04
+- name: amazonlinux-2
 - name: ubuntu-16.04
+- name: ubuntu-18.04
+- name: fedora-latest
 - name: centos-6
 - name: centos-7
 - name: oraclelinux-6
 - name: oraclelinux-7
 - name: debian-8
-- name: opensuse-42.2
+- name: debian-9
+- name: opensuse-42.3
   driver:
-    image: opensuse:42.2
+    image: opensuse:42.3
 # - name: arch
 #   driver:
 #     image: base/archlinux
@@ -43,7 +46,7 @@ suites:
   driver:
     build_context: false
 - name: capabilities
-  excludes: [arch,unknown,centos-7,centos-6,oraclelinux-6,oraclelinux-7,dockerfile,opensuse-42.2]
+  includes: [debian-8,debian-9,ubuntu-16.04,ubuntu-18.04]
   driver:
     provision_command:
     - curl -L https://www.chef.io/chef/install.sh | bash

.travis.yml

@@ -1,11 +1,12 @@
-sudo: required
-dist: trusty
+dist: xenial
 language: ruby
+cache: bundler
 
 rvm:
-- "2.3.1"
-- "2.4.3"
-- "2.5.1"
+- 2.3.8
+- 2.4.5
+- 2.5.4
+- 2.6.2
 
 services:
 - docker

README.md

@@ -44,22 +44,22 @@ Examples:
 ```yaml
 ---
 platforms:
-- name: ubuntu-12.04
-- name: centos-6.4
+- name: ubuntu-18.04
+- name: centos-7
 ```
 
 This will effectively generate a configuration similar to:
 
 ```yaml
 ---
 platforms:
-- name: ubuntu-12.04
+- name: ubuntu-18.04
   driver_config:
-    image: ubuntu:12.04
+    image: ubuntu:18.04
     platform: ubuntu
-- name: centos-6.4
+- name: centos-7
   driver_config:
-    image: centos:6.4
+    image: centos:7
     platform: centos
 ```
 
@@ -129,8 +129,9 @@ Configuration section for more details).
 The platform of the chosen image. This is used to properly bootstrap the
 suite container for Test Kitchen. Kitchen Docker currently supports:
 
+* `arch`
 * `debian` or `ubuntu`
-* `rhel` or `centos`
+* `amazonlinux`, `rhel`, `centos`, `fedora` or `oraclelinux`
 * `gentoo` or `gentoo-paludis`
 * `opensuse` or `sles`
 

lib/kitchen/driver/docker.rb

@@ -216,7 +216,7 @@ def build_dockerfile
             RUN apt-get install -y sudo openssh-server curl lsb-release
           eos
           config[:disable_upstart] ? disable_upstart + packages : packages
-        when 'rhel', 'centos', 'fedora', 'oraclelinux'
+        when 'rhel', 'centos', 'fedora', 'oraclelinux', 'amazonlinux'
           <<-eos
             ENV container docker
             RUN yum clean all