Merge branch 'master' into macos

test/integration/v201902-py3/controls/pkgs_spec.rb

@@ -1,18 +1,25 @@
 # frozen_string_literal: true
 
+# Prepare platform "finger"
+platform_finger = "#{platform[:name]}-#{platform[:release].split('.')[0]}"
+
 version =
   case platform[:family]
+  when 'debian'
+    '2019.2.5+ds-1'
   when 'redhat'
-    case platform[:name]
-    when 'amazon'
-      '2019.2.3-1.amzn2'
-    when 'centos'
-      '2019.2.3-1.el8'
+    case platform_finger
+    when 'centos-8'
+      '2019.2.5-1.el8'
+    when 'centos-7'
+      '2019.2.5-1.el7'
+    when 'amazon-2'
+      '2019.2.5-1.amzn2'
     end
   when 'suse'
     '2019.2.0-lp151.5.9.1'
   when 'debian'
-    '2019.2.3+ds-1'
+    '2019.2.3+ds-1
   end
 
 control 'salt packages' do
@@ -27,4 +34,4 @@ control 'salt packages' do
       its('version') { should eq version }
     end
   end
-end
+end

test/integration/v201902-py3/controls/service_spec.rb

@@ -8,6 +8,7 @@ control 'salt services' do
     salt-minion
   ].each do |p|
     describe service(p) do
+      it { should be_installed }
       it { should be_enabled }
       it { should be_running }
     end