Merge pull request #46404 from gtmanfred/kitchen

get 2017.7 ready to switch over to the new jenkins

.kitchen.yml

@@ -41,8 +41,6 @@ provisioner:
     testingdir: /testing
   salt_copy_filter:
     - .bundle
-    - .git
-    - .gitignore
     - .kitchen
     - .kitchen.yml
     - Gemfile
@@ -202,6 +200,6 @@ verifier:
   save:
     /tmp/xml-unittests-output: artifacts/
     /tmp/coverage.xml: artifacts/coverage/coverage.xml
-    /var/log/salt/minion: artifacts/logs/minion
+    /tmp/kitchen/var/log/salt/minion: artifacts/logs/minion
     /tmp/salt-runtests.log: artifacts/logs/salt-runtests.log
 <% end %>

tests/integration/modules/test_pkg.py

@@ -174,6 +174,7 @@ class PkgModuleTest(ModuleCase, SaltReturnAssertsMixin):
         available = self.run_function('sys.doc', ['pkg.hold'])
 
         if available:
+            self.run_function('pkg.install', [self.pkg])
             if os_family == 'RedHat':
                 lock_pkg = 'yum-versionlock' if os_major_release == '5' else 'yum-plugin-versionlock'
                 versionlock = self.run_function('pkg.version', [lock_pkg])
@@ -186,11 +187,12 @@ class PkgModuleTest(ModuleCase, SaltReturnAssertsMixin):
 
             unhold_ret = self.run_function('pkg.unhold', [self.pkg])
             self.assertIn(self.pkg, unhold_ret)
-            self.assertTrue(hold_ret[self.pkg]['result'])
+            self.assertTrue(unhold_ret[self.pkg]['result'])
 
             if os_family == 'RedHat':
                 if not versionlock:
                     self.run_function('pkg.remove', [lock_pkg])
+            self.run_function('pkg.remove', [self.pkg])
 
         else:
             os_grain = self.run_function('grains.item', ['os'])['os']