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

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
-    it { should be_installed }
-    its('version') { should eq version }
-  end
-
-  describe package('salt-minion') do
-    it { should be_installed }
-    its('version') { should eq version }
+  %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/2017-7/service_spec.rb

@@ -1,14 +1,13 @@
 control 'salt services' do
   title 'should be running'
 
-  describe service('salt-master') do
-    it { should be_enabled }
-    it { should be_running }
+  %w(
+    salt-master
+    salt-minion
+  ).each do |p|
+    describe service(p) do
+      it { should be_enabled }
+      it { should be_running }
+    end
   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
-    it { should be_installed }
-    its('version') { should eq version }
-  end
-
-  describe package('salt-minion') do
-    it { should be_installed }
-    its('version') { should eq version }
+  %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/2018-3/service_spec.rb

@@ -1,14 +1,13 @@
 control 'salt services' do
   title 'should be running'
 
-  describe service('salt-master') do
-    it { should be_enabled }
-    it { should be_running }
+  %w(
+    salt-master
+    salt-minion
+  ).each do |p|
+    describe service(p) do
+      it { should be_enabled }
+      it { should be_running }
+    end
   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
-    it { should be_installed }
-    its('version') { should eq version }
-  end
-
-  describe package('salt-minion') do
-    it { should be_installed }
-    its('version') { should eq version }
+  %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/2019-2/service_spec.rb

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