Merge pull request #204 from myii/ci/fix-centos6-suite-and-rename-to-upstart

ci(kitchen+travis): fix `centos6` suite and rename to `upstart`

.travis.yml

@@ -104,8 +104,8 @@ jobs:
     # - env: INSTANCE=default-fedora-31-2019-2-py3
     # - env: INSTANCE=default-opensuse-leap-152-2019-2-py3
     # - env: INSTANCE=default-amazonlinux-2-2019-2-py3
-    # - env: INSTANCE=default-centos-6-2019-2-py2
-    # - env: INSTANCE=default-amazonlinux-1-2019-2-py2
+    - env: INSTANCE=upstart-centos-6-2019-2-py2
+    # - env: INSTANCE=upstart-amazonlinux-1-2019-2-py2
     - env: INSTANCE=default-arch-base-latest-2019-2-py2
     # <REMOVEME
 

kitchen.yml

@@ -150,7 +150,8 @@ verifier:
 suites:
   - name: default
     excludes:
-      - centos-6-2018-3-py2
+      - centos-6-2019-2-py2
+      - amazonlinux-1-2019-2-py2
     provisioner:
       state_top:
         base:
@@ -168,9 +169,10 @@ suites:
     verifier:
       inspec_tests:
         - path: test/integration/default
-  - name: centos6
+  - name: upstart
     includes:
-      - centos-6-2018-3-py2
+      - centos-6-2019-2-py2
+      - amazonlinux-1-2019-2-py2
     provisioner:
       state_top:
         base:
@@ -183,7 +185,7 @@ suites:
               - TEMPLATE
               - define_roles
       pillars_from_files:
-        TEMPLATE.sls: test/salt/pillar/centos6.sls
+        TEMPLATE.sls: test/salt/pillar/upstart.sls
         define_roles.sls: test/salt/pillar/define_roles.sls
     verifier:
       inspec_tests:

test/integration/default/controls/packages_spec.rb

@@ -1,12 +1,20 @@
 # frozen_string_literal: true
 
-# Overide by OS
-package_name = 'bash'
-package_name = 'cronie' if (os[:name] == 'centos') && os[:release].start_with?('6')
+# Prepare platform "finger"
+platform_finger = "#{platform[:name]}-#{platform[:release].split('.')[0]}"
 
 control 'TEMPLATE package' do
   title 'should be installed'
 
+  # Overide by `platform_finger`
+  package_name =
+    case platform_finger
+    when 'centos-6', 'amazon-2018'
+      'cronie'
+    else
+      'bash'
+    end
+
   describe package(package_name) do
     it { should be_installed }
   end

test/integration/default/controls/services_spec.rb

@@ -1,14 +1,23 @@
 # frozen_string_literal: true
 
-# Overide by OS
-service_name = 'systemd-journald'
-service_name = 'crond' if (os[:name] == 'centos') && os[:release].start_with?('6')
+# Prepare platform "finger"
+platform_finger = "#{platform[:name]}-#{platform[:release].split('.')[0]}"
 
 control 'TEMPLATE service' do
   impact 0.5
   title 'should be running and enabled'
 
+  # Overide by `platform_finger`
+  service_name =
+    case platform_finger
+    when 'centos-6', 'amazon-2018'
+      'crond'
+    else
+      'systemd-journald'
+    end
+
   describe service(service_name) do
+    it { should be_installed }
     it { should be_enabled }
     it { should be_running }
   end