Merge pull request #196 from artem-forks/tests

Update of CI and test environment

Author: artem-sidorenko

.kitchen.dokken.yml

@@ -19,23 +19,21 @@ verifier:
   sudo: true
 
 platforms:
-- name: ubuntu-14-04
+- name: amazonlinux-1
   driver:
-    image: ubuntu:14.04
-- name: ubuntu-16-04
+    image: dokken/amazonlinux
+    pid_one_command: /sbin/init
+- name: amazonlinux-2
   driver:
-    image: ubuntu:16.04
-    intermediate_instructions:
-    - RUN /usr/bin/apt-get update
-    pid_one_command: /bin/systemd
+    image: dokken/amazonlinux-2
+    pid_one_command: /usr/lib/systemd/systemd
 - name: centos-6
   driver:
-    image: centos:6
-    intermediate_instructions:
-      - RUN yum install -y initscripts
+    image: dokken/centos-6
+    pid_one_command: /sbin/init
 - name: centos-7
   driver:
-    image: centos:7
+    image: dokken/centos-7
     pid_one_command: /usr/lib/systemd/systemd
 - name: oracle-6
   driver:
@@ -44,47 +42,52 @@ platforms:
   driver:
     image: oraclelinux:7
     pid_one_command: /usr/lib/systemd/systemd
-- name: debian-7
+- name: debian-8
   driver:
-    image: debian:7
+    image: dokken/debian-8
     intermediate_instructions:
     - RUN /usr/bin/apt-get update
-    - RUN /usr/bin/apt-get install -y procps
-- name: debian-8
+    pid_one_command: /bin/systemd
+- name: debian-9
   driver:
-    image: debian:8
+    image: dokken/debian-9
     intermediate_instructions:
     - RUN /usr/bin/apt-get update
-    - RUN /usr/bin/apt-get install -y procps
     pid_one_command: /bin/systemd
-- name: fedora-24
+- name: fedora-27
   driver:
-    image: fedora:24
+    image: dokken/fedora-27
     pid_one_command: /usr/lib/systemd/systemd
     intermediate_instructions:
     - RUN dnf install -y yum
-- name: fedora-25
+- name: fedora-28
   driver:
-    image: fedora:25
+    image: dokken/fedora-28
     pid_one_command: /usr/lib/systemd/systemd
     intermediate_instructions:
     - RUN dnf install -y yum
 - name: opensuse-42
   driver:
-    image: opensuse:leap
-    pid_one_command: /usr/lib/systemd/systemd
-- name: amazonlinux-1
+    image: dokken/opensuse-leap
+    pid_one_command: /bin/systemd
+- name: ubuntu-14-04
   driver:
-    image: amazonlinux:1
-    intermediate_instructions:
-    - RUN yum -y install upstart procps util-linux
+    image: dokken/ubuntu-14.04
     pid_one_command: /sbin/init
-- name: amazonlinux-2
+    intermediate_instructions:
+      - RUN /usr/bin/apt-get update
+- name: ubuntu-16-04
   driver:
-    image: amazonlinux:2
+    image: dokken/ubuntu-16.04
+    pid_one_command: /bin/systemd
     intermediate_instructions:
-    - RUN yum -y install systemd
-    pid_one_command: /usr/lib/systemd/systemd
+      - RUN /usr/bin/apt-get update
+- name: ubuntu-18-04
+  driver:
+    image: dokken/ubuntu-18.04
+    pid_one_command: /bin/systemd
+    intermediate_instructions:
+      - RUN /usr/bin/apt-get update
 
 suites:
 - name: default

.kitchen.yml

@@ -5,15 +5,22 @@ driver:
 platforms:
 - name: ubuntu-14.04
 - name: ubuntu-16.04
-- name: centos-6.8
-- name: centos-7.3
-- name: oracle-6.8
-- name: oracle-7.3
-- name: debian-7.11
-- name: debian-8.6
-- name: fedora-24
-- name: fedora-25
-- name: opensuse-leap-42.1
+- name: ubuntu-18-04
+- name: centos-6
+- name: centos-7
+- name: oracle-6
+- name: oracle-7
+- name: debian-8
+- name: debian-9
+- name: fedora-26
+- name: fedora-27
+- name: opensuse-leap-42
+- name: amazonlinux-1
+  driver_config:
+    box: realreadme/amazon2016.09
+- name: amazonlinux-2
+  driver_config:
+    box: stakahashi/amazonlinux2
 
 provisioner:
   name: chef_solo

.travis.yml

@@ -8,7 +8,7 @@ cache: bundler
 services:
 - docker
 
-rvm: 2.4.1
+rvm: 2.4.4
 
 before_install:
   - gem update --system # see https://github.com/bundler/bundler/issues/5357
@@ -17,15 +17,16 @@ env:
  - INSTANCE=ubuntu-14-04
  - INSTANCE=ubuntu-16-04
  - INSTANCE=ubuntu-16-04 CHEF_VERSION=12.5.1
+ - INSTANCE=ubuntu-18-04
  - INSTANCE=centos-6
  - INSTANCE=centos-7
  - INSTANCE=centos-7 CHEF_VERSION=12.5.1
  - INSTANCE=oracle-6
  - INSTANCE=oracle-7
- - INSTANCE=debian-7
  - INSTANCE=debian-8
- - INSTANCE=fedora-24
- - INSTANCE=fedora-25
+ - INSTANCE=debian-9
+ - INSTANCE=fedora-27
+ - INSTANCE=fedora-28
  - INSTANCE=opensuse-42
  - INSTANCE=opensuse-42 CHEF_VERSION=12.5.1
  - INSTANCE=amazonlinux-1

Gemfile

@@ -8,7 +8,7 @@ gem 'chef', '~> 12.5' # chefspec builds get stucked with 13.1
 group :test do
   gem 'chefspec', '~> 7.1.0'
   gem 'coveralls', require: false
-  gem 'foodcritic', '~> 11.1'
+  gem 'foodcritic', '~> 13.0'
   gem 'rake'
   gem 'rubocop', '~> 0.49.0'
   gem 'simplecov', '~> 0.10'
@@ -23,9 +23,9 @@ end
 
 group :integration do
   gem 'kitchen-dokken'
-  gem 'kitchen-inspec'
+  gem 'kitchen-inspec', '>= 0.23.1'
   gem 'kitchen-vagrant'
-  gem 'test-kitchen', '~> 1.0'
+  gem 'test-kitchen', '~> 1.20'
 end
 
 group :tools do