Merge branch '2017.7' into '2018.3'

doc/topics/installation/rhel.rst

@@ -49,17 +49,13 @@ the SaltStack Repository.
 Installation from the Community-Maintained Repository
 =====================================================
 
-Beginning with version 0.9.4, Salt has been available in `EPEL`_. For
-RHEL/CentOS 5, `Fedora COPR`_ is a single community repository that provides
-Salt packages due to the removal from EPEL5.
+Beginning with version 0.9.4, Salt has been available in `EPEL`_.
 
 .. note::
-   Packages in these repositories are built by community, and it can
-   take a little while until the latest stable SaltStack release become
-   available.
+   Packages in this repository are built by community, and it can take a little
+   while until the latest stable SaltStack release become available.
 
 .. _`EPEL`: http://fedoraproject.org/wiki/EPEL
-.. _`Fedora COPR`: https://copr.fedorainfracloud.org/coprs/saltstack/salt-el5/
 
 RHEL/CentOS 6 and 7, Scientific Linux, etc.
 -------------------------------------------
@@ -146,26 +142,13 @@ ZeroMQ 4
 ========
 
 We recommend using ZeroMQ 4 where available. SaltStack provides ZeroMQ 4.0.5
-and pyzmq 14.5.0 in the :ref:`SaltStack Repository <installation-rhel-repo>`
-as well as a separate `zeromq4 COPR`_ repository.
-
-.. _`zeromq4 COPR`: http://copr.fedorainfracloud.org/coprs/saltstack/zeromq4/
+and ``pyzmq`` 14.5.0 in the :ref:`SaltStack Repository
+<installation-rhel-repo>`.
 
 If this repository is added *before* Salt is installed, then installing either
 ``salt-master`` or ``salt-minion`` will automatically pull in ZeroMQ 4.0.5, and
 additional steps to upgrade ZeroMQ and pyzmq are unnecessary.
 
-.. warning:: RHEL/CentOS 5 Users
-    Using COPR repos on RHEL/CentOS 5 requires that the ``python-hashlib``
-    package be installed. Not having it present will result in checksum errors
-    because YUM will not be able to process the SHA256 checksums used by COPR.
-
-.. note::
-    For RHEL/CentOS 5 installations, if using the SaltStack repo or Fedora COPR
-    to install Salt (as described :ref:`above <installation-rhel-repo>`),
-    then it is not necessary to enable the `zeromq4 COPR`_, because those
-    repositories already include ZeroMQ 4.
-
 Package Management
 ==================
 

tests/integration/files/file/base/mkimage-busybox-static

@@ -82,6 +82,9 @@ cp "$busybox" "$rootfsDir/bin/busybox"
 	unset IFS
 
 	for module in "${modules[@]}"; do
+		# Don't stomp on the busybox binary (newer busybox releases
+		# include busybox in the --list-modules output)
+		test "$module" == "bin/busybox" && continue
 		mkdir -p "$(dirname "$module")"
 		ln -sf /bin/busybox "$module"
 	done

tests/integration/shell/test_auth.py

@@ -59,12 +59,18 @@ class AuthTest(ShellCase):
     def setUp(self):
         for user in (self.userA, self.userB):
             try:
+                if salt.utils.is_darwin() and user not in str(self.run_call('user.list_users')):
+                    # workaround for https://github.com/saltstack/salt-jenkins/issues/504
+                    raise KeyError
                 pwd.getpwnam(user)
             except KeyError:
                 self.run_call('user.add {0} createhome=False'.format(user))
 
         # only put userB into the group for the group auth test
         try:
+            if salt.utils.is_darwin() and self.group not in str(self.run_call('group.info {0}'.format(self.group))):
+                # workaround for https://github.com/saltstack/salt-jenkins/issues/504
+                raise KeyError
             grp.getgrnam(self.group)
         except KeyError:
             self.run_call('group.add {0}'.format(self.group))

tests/integration/states/test_npm.py

@@ -44,14 +44,19 @@ class NpmStateTest(ModuleCase, SaltReturnAssertsMixin):
         '''
         Determine if URL-referenced NPM module can be successfully installed.
         '''
-        user = os.environ.get('SUDO_USER', 'root')
-        npm_dir = os.path.join(RUNTIME_VARS.TMP, 'git-install-npm')
-        self.run_state('file.directory', name=npm_dir, user=user, dir_mode='755')
+        if LooseVersion(cmd.run('npm -v')) >= LooseVersion(MAX_NPM_VERSION):
+            user = os.environ.get('SUDO_USER', 'root')
+            npm_dir = os.path.join(RUNTIME_VARS.TMP, 'git-install-npm')
+            self.run_state('file.directory', name=npm_dir, user=user, dir_mode='755')
+        else:
+            user = None
+            npm_dir = None
         ret = self.run_state('npm.installed', name='request/request#v2.81.1', runas=user, dir=npm_dir)
         self.assertSaltTrueReturn(ret)
         ret = self.run_state('npm.removed', name='git://github.com/request/request', runas=user, dir=npm_dir)
         self.assertSaltTrueReturn(ret)
-        self.run_state('file.absent', name=npm_dir)
+        if npm_dir is not None:
+            self.run_state('file.absent', name=npm_dir)
 
     @requires_network()
     @destructiveTest