Merge branch 'master' into macos

test/integration/v201707-py2/controls/pkgs_spec.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-version =
-  case platform[:family]
-  when 'redhat'
-    case platform[:name]
-    when 'amazon'
-      '2017.7.8-1.el7'
-    when 'centos'
-      '2017.7.8-1.el6'
-    end
-  when 'debian'
-    '2017.7.8+ds-1'
-  end
-
-control 'salt packages' do
-  title 'should be installed'
-
-  %w[
-    salt-master
-    salt-minion
-  ].each do |p|
-    describe package(p) do
-      it { should be_installed }
-      its('version') { should eq version }
-    end
-  end
-end

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

@@ -1,11 +1,23 @@
 # frozen_string_literal: true
 
+# Prepare platform "finger"
+platform_finger = "#{platform[:name]}-#{platform[:release].split('.')[0]}"
+
 version =
   case platform[:family]
-  when 'redhat'
-    '2019.2.3-1.el7'
   when 'debian'
-    '2019.2.3+ds-1'
+    '2019.2.5+ds-1'
+  when 'redhat'
+    case platform_finger
+    when 'centos-7'
+      '2019.2.5-1.el7'
+    when 'centos-6'
+      '2019.2.5-1.el6'
+    when 'amazon-2'
+      '2019.2.5-1.amzn2'
+    when 'amazon-2018'
+      '2019.2.5-1.amzn1'
+    end
   end
 
 control 'salt packages' do

test/integration/v201902-py2/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

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

test/integration/v3000-py2/README.md

@@ -1,16 +1,16 @@
-# InSpec Profile: `v201707-py2`
+# InSpec Profile: `v3000-py2`
 
-This shows the implementation of the `v201707-py2` InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md).
+This shows the implementation of the `v3000-py2` InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md).
 
 ## Verify a profile
 
 InSpec ships with built-in features to verify a profile structure.
 
 ```bash
-$ inspec check v201707-py2
+$ inspec check v3000-py2
 Summary
 -------
-Location: v201707-py2
+Location: v3000-py2
 Profile: profile
 Controls: 4
 Timestamp: 2019-06-24T23:09:01+00:00
@@ -28,7 +28,7 @@ Warnings
 To run all **supported** controls on a local machine use `inspec exec /path/to/profile`.
 
 ```bash
-$ inspec exec v201707-py2
+$ inspec exec v3000-py2
 ..
 
 Finished in 0.0025 seconds (files took 0.12449 seconds to load)
@@ -40,7 +40,7 @@ Finished in 0.0025 seconds (files took 0.12449 seconds to load)
 To run one control from the profile use `inspec exec /path/to/profile --controls name`.
 
 ```bash
-$ inspec exec v201707-py2 --controls package
+$ inspec exec v3000-py2 --controls package
 .
 
 Finished in 0.0025 seconds (files took 0.12449 seconds to load)

test/integration/v3000-py2/controls/pkgs_spec.rb

@@ -2,10 +2,8 @@
 
 version =
   case platform[:family]
-  when 'redhat'
-    '2018.3.5-1.el7'
   when 'debian'
-    '2018.3.5+ds-1'
+    '3000.3+ds-1'
   end
 
 control 'salt packages' do

test/integration/v3000-py2/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

test/integration/v3000-py2/inspec.yml

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
-name: v201803-py2
+name: v3000-py2
 title: salt formula
 maintainer: SaltStack Formulas
 license: Apache-2.0
-summary: Verify that Salt `v201803-py2` is setup and configured
+summary: Verify that Salt `v3000-py2` is setup and configured
 supports:
   - platform-name: debian
   - platform-name: ubuntu

test/integration/v3000-py3/README.md

@@ -1,16 +1,16 @@
-# InSpec Profile: `v201803-py2`
+# InSpec Profile: `v3000-py3`
 
-This shows the implementation of the `v201803-py2` InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md).
+This shows the implementation of the `v3000-py3` InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md).
 
 ## Verify a profile
 
 InSpec ships with built-in features to verify a profile structure.
 
 ```bash
-$ inspec check v201803-py2
+$ inspec check v3000-py3
 Summary
 -------
-Location: v201803-py2
+Location: v3000-py3
 Profile: profile
 Controls: 4
 Timestamp: 2019-06-24T23:09:01+00:00
@@ -28,7 +28,7 @@ Warnings
 To run all **supported** controls on a local machine use `inspec exec /path/to/profile`.
 
 ```bash
-$ inspec exec v201803-py2
+$ inspec exec v3000-py3
 ..
 
 Finished in 0.0025 seconds (files took 0.12449 seconds to load)
@@ -40,7 +40,7 @@ Finished in 0.0025 seconds (files took 0.12449 seconds to load)
 To run one control from the profile use `inspec exec /path/to/profile --controls name`.
 
 ```bash
-$ inspec exec v201803-py2 --controls package
+$ inspec exec v3000-py3 --controls package
 .
 
 Finished in 0.0025 seconds (files took 0.12449 seconds to load)

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+# Prepare platform "finger"
+platform_finger = "#{platform[:name]}-#{platform[:release].split('.')[0]}"
+
+version =
+  case platform[:family]
+  when 'debian'
+    '3000.3+ds-1'
+  when 'redhat'
+    case platform_finger
+    when 'centos-8'
+      '3000.3-1.el8'
+    when 'centos-7'
+      '3000.3-1.el7'
+    when 'amazon-2'
+      '3000.3-1.amzn2'
+    end
+  when 'fedora'
+    '3000.3-1.fc31'
+  when 'suse'
+    # Issue in the upstream repo, should be `3000.3`
+    case platform[:release]
+    when /^15.2/
+      '3000.2-lp152.7.1'
+    when /^15.1/
+      '3000.2-lp151.2.1'
+    end
+  end
+
+control 'salt packages' do
+  title 'should be installed'
+
+  %w[
+    salt-master
+    salt-minion
+  ].each do |p|
+    describe package(p) do
+      it { should be_installed }
+      its('version') { should eq version }
+    end
+  end
+end

test/integration/v3000-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

test/integration/v3000-py3/inspec.yml

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
-name: v201707-py2
+name: v3000-py3
 title: salt formula
 maintainer: SaltStack Formulas
 license: Apache-2.0
-summary: Verify that Salt `v201707-py2` is setup and configured
+summary: Verify that Salt `v3000-py3` is setup and configured
 supports:
   - platform-name: debian
   - platform-name: ubuntu