Bootstrap using git, so versions don't collide at package install time.

kitchen.yml

@@ -30,7 +30,7 @@ platforms:
 
 provisioner:
   name: salt_solo
-  salt_bootstrap_options: -X -d
+  salt_bootstrap_options: -X -d git %s
   log_level: info
   require_chef: false
   formula: salt
@@ -85,7 +85,7 @@ suites:
       - ubuntu-18.04
       - centos-7
     provisioner:
-      salt_version: '2019.2.0'
+      salt_version: '2019.2'
       pillars:
         salt.sls:
           salt:
@@ -102,7 +102,7 @@ suites:
     includes:
       - fedora-29
     provisioner:
-      salt_version: '2019.2.0'
+      salt_version: '2019.2'
       pillars:
         salt.sls:
           salt:
@@ -122,7 +122,7 @@ suites:
     provisioner:
       # We require an old version of salt in the provisioner or,
       # the salt formula fails to downgrade to the desired version to test
-      salt_version: '2018.3.3'
+      salt_version: '2018.3'
       pillars:
         salt.sls:
           salt:
@@ -140,7 +140,7 @@ suites:
     provisioner:
       # We require an old version of salt in the provisioner or,
       # the salt formula fails to downgrade to the desired version to test
-      salt_version: '2016.11.10'
+      salt_version: '2016.11'
       pillars:
         salt.sls:
           salt:
@@ -158,7 +158,7 @@ suites:
     provisioner:
       # We require an old version of salt in the provisioner or,
       # the salt formula fails to downgrade to the desired version to test
-      salt_version: '2018.3.3'
+      salt_version: '2018.3'
       pillars:
         salt.sls:
           salt:
@@ -178,7 +178,7 @@ suites:
     provisioner:
       # We require an old version of salt in the provisioner or,
       # the salt formula fails to downgrade to the desired version to test
-      salt_version: '2017.7.8'
+      salt_version: '2017.7'
       pillars:
         salt.sls:
           salt:
@@ -196,7 +196,7 @@ suites:
     provisioner:
       # We require an old version of salt in the provisioner or,
       # the salt formula fails to downgrade to the desired version to test
-      salt_version: '2016.11.10'
+      salt_version: '2016.11'
       pillars:
         salt.sls:
           salt:

test/integration/2017-7/pkgs_spec.rb

@@ -8,13 +8,13 @@ end
 control 'salt packages' do
   title 'should be installed'
 
-  describe package('salt-master') do
+  %w(
-    it { should be_installed }
+    salt-master
-    its('version') { should eq version }
+    salt-minion
-  end
+  ).each do |p|
-
+    describe package(p) do
-  describe package('salt-minion') do
       it { should be_installed }
       its('version') { should eq version }
     end
   end
+end

test/integration/2017-7/service_spec.rb

@@ -1,14 +1,13 @@
 control 'salt services' do
   title 'should be running'
 
-  describe service('salt-master') do
+  %w(
+    salt-master
+    salt-minion
+  ).each do |p|
+    describe service(p) do
       it { should be_enabled }
       it { should be_running }
     end
-
-  describe service('salt-minion') do
-    it { should be_enabled }
-    it { should be_running }
   end
-
 end

test/integration/2018-3/pkgs_spec.rb

@@ -12,13 +12,13 @@ end
 control 'salt packages' do
   title 'should be installed'
 
-  describe package('salt-master') do
+  %w(
-    it { should be_installed }
+    salt-master
-    its('version') { should eq version }
+    salt-minion
-  end
+  ).each do |p|
-
+    describe package(p) do
-  describe package('salt-minion') do
       it { should be_installed }
       its('version') { should eq version }
     end
   end
+end

test/integration/2018-3/service_spec.rb

@@ -1,14 +1,13 @@
 control 'salt services' do
   title 'should be running'
 
-  describe service('salt-master') do
+  %w(
+    salt-master
+    salt-minion
+  ).each do |p|
+    describe service(p) do
       it { should be_enabled }
       it { should be_running }
     end
-
-  describe service('salt-minion') do
-    it { should be_enabled }
-    it { should be_running }
   end
-
 end

test/integration/2019-2/pkgs_spec.rb

@@ -10,13 +10,13 @@ end
 control 'salt packages' do
   title 'should be installed'
 
-  describe package('salt-master') do
+  %w(
-    it { should be_installed }
+    salt-master
-    its('version') { should eq version }
+    salt-minion
-  end
+  ).each do |p|
-
+    describe package(p) do
-  describe package('salt-minion') do
       it { should be_installed }
       its('version') { should eq version }
     end
   end
+end

test/integration/2019-2/service_spec.rb

@@ -1,14 +1,13 @@
 control 'salt services' do
   title 'should be running'
 
-  describe service('salt-master') do
+  %w(
+    salt-master
+    salt-minion
+  ).each do |p|
+    describe service(p) do
       it { should be_enabled }
       it { should be_running }
     end
-
-  describe service('salt-minion') do
-    it { should be_enabled }
-    it { should be_running }
   end
-
 end