Added support and tests for Sys V service files

Author: dmurphy18

changelog/67888.fixed.md

@@ -0,0 +1 @@
+Added service files for specific rpm packages to /etc/init.d

pkg/rpm/salt.spec

@@ -308,6 +308,13 @@ install -p -m 0644 %{_salt_src}/doc/man/salt-api.1 %{buildroot}%{_mandir}/man1/s
 install -p -m 0644 %{_salt_src}/doc/man/salt-cloud.1 %{buildroot}%{_mandir}/man1/salt-cloud.1
 install -p -m 0644 %{_salt_src}/doc/man/salt-ssh.1 %{buildroot}%{_mandir}/man1/salt-ssh.1
 
+# Sys V service files
+mkdir -p %{buildroot}%{_sysconfdir}/init.d
+install -p -m 0755 %{_salt_src}/pkg/rpm/salt-minion %{buildroot}%{_sysconfdir}/init.d/salt-minion
+install -p -m 0755 %{_salt_src}/pkg/rpm/salt-master %{buildroot}%{_sysconfdir}/init.d/salt-master
+install -p -m 0755 %{_salt_src}/pkg/rpm/salt-syndic %{buildroot}%{_sysconfdir}/init.d/salt-syndic
+install -p -m 0755 %{_salt_src}/pkg/rpm/salt-api %{buildroot}%{_sysconfdir}/init.d/salt-api
+
 
 %clean
 rm -rf %{buildroot}
@@ -360,6 +367,7 @@ rm -rf %{buildroot}
 %dir %attr(0750, salt, salt) %{_var}/cache/salt/master/roots/
 %dir %attr(0750, salt, salt) %{_var}/cache/salt/master/syndics/
 %dir %attr(0750, salt, salt) %{_var}/cache/salt/master/tokens/
+%{_sysconfdir}/init.d/salt-master
 
 
 %files minion
@@ -377,19 +385,22 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/salt/pki/minion
 %dir %{_sysconfdir}/salt/minion.d
 %dir %attr(0750, root, root) %{_var}/cache/salt/minion/
+%{_sysconfdir}/init.d/salt-minion
 
 
 %files syndic
 %doc %{_mandir}/man1/salt-syndic.1*
 %{_bindir}/salt-syndic
 %{_unitdir}/salt-syndic.service
+%{_sysconfdir}/init.d/salt-syndic
 
 
 %files api
 %defattr(-,root,root)
 %doc %{_mandir}/man1/salt-api.1*
 %{_bindir}/salt-api
 %{_unitdir}/salt-api.service
+%{_sysconfdir}/init.d/salt-api
 
 
 %files cloud

tests/pytests/pkg/upgrade/test_salt_upgrade.py

@@ -1,4 +1,6 @@
 import logging
+import os
+import subprocess
 import sys
 import time
 
@@ -7,6 +9,8 @@
 import pytest
 from pytestskipmarkers.utils import platform
 
+import salt.utils.path
+
 log = logging.getLogger(__name__)
 
 
@@ -126,6 +130,65 @@ def _get_running_named_salt_pid(process_name):
     return pids
 
 
+def test_salt_sysv_service_files(salt_call_cli, install_salt):
+    """
+    Test an upgrade of Salt, Minion and Master
+    """
+    if not install_salt.upgrade:
+        pytest.skip("Not testing an upgrade, do not run")
+
+    if sys.platform != "linux":
+        pytest.skip("Not testing on a Linux platform, do not run")
+
+    if not (salt.utils.path.which("dpkg") or salt.utils.path.which("rpm")):
+        pytest.skip("Not testing on a Debian or RedHat family platform, do not run")
+
+    print(
+        f"DGM test_salt_sysv_service_files entry install_salt, '{install_salt}'",
+        flush=True,
+    )
+
+    test_pkgs = install_salt.config_path.pkgs
+    print(f"DGM test_salt_sysv_service_files test_pkgs, '{test_pkgs}'", flush=True)
+    for test_pkg_name in test_pkgs:
+        test_pkg_basename = os.path.bashname(test_pkg_name)
+        test_pkg_basename_adj = test_pkg_basename.split("_")
+        print(
+            f"DGM test_salt_sysv_service_files test_pkg_basename_adj '{test_pkg_basename_adj}' from name test_pkg_basename '{test_pkg_basename}'",
+            flush=True,
+        )
+        if test_pkg_basename_adj in (
+            "salt-minion",
+            "salt-master",
+            "salt-syndic",
+            "salt-api",
+        ):
+            test_initd_name = f"/etc/init.d/{test_pkg_basename_adj}"
+            if salt.utils.path.which("dpkg"):
+                proc = subprocess.run(
+                    ["dpkg", "-q", "-c", f"{test_pkg_name}"],
+                    capture_output=True,
+                    check=True,
+                )
+            elif salt.utils.path.which("rpm"):
+                proc = subprocess.run(
+                    ["rpm", "-q", "-l", "-p", f"{test_pkg_name}"],
+                    capture_output=True,
+                    check=True,
+                )
+            found_line = False
+            for line in proc.stdout.decode().splitlines():
+                # If test_initd_name not present we should fail.
+                if line == test_initd_name:
+                    found_line = True
+                    print(
+                        f"DGM test_salt_sysv_service_files test_initd_name, '{test_initd_name}' was FOUND",
+                        flush=True,
+                    )
+
+            assert found_line
+
+
 def test_salt_upgrade(salt_call_cli, install_salt):
     """
     Test an upgrade of Salt, Minion and Master