mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Exclude Debian & Ubuntu downgrade testing till fixes from PR 66218
This commit is contained in:
David Murphy
Daniel Wozniak
parent
bf1d23ca8b
commit
dd1309cb2b
1 changed files with 11 additions and 85 deletions
|
|
@ -2,41 +2,9 @@ import time
|
|||
|
||||
import packaging.version
|
||||
import psutil
|
||||
|
||||
## DGM import pytest
|
||||
import pytest
|
||||
from pytestskipmarkers.utils import platform
|
||||
|
||||
## DGM @pytest.fixture
|
||||
## DGM def salt_systemd_setup(
|
||||
## DGM salt_call_cli,
|
||||
## DGM install_salt,
|
||||
## DGM ):
|
||||
## DGM """
|
||||
## DGM Fixture to set systemd for salt packages to enabled and active
|
||||
## DGM Note: assumes Salt packages already installed
|
||||
## DGM """
|
||||
## DGM # ensure known state, enabled and active
|
||||
## DGM test_list = ["salt-minion"]
|
||||
## DGM for test_item in test_list:
|
||||
## DGM test_cmd = f"systemctl enable {test_item}"
|
||||
## DGM ret = salt_call_cli.run("--local", "cmd.run", test_cmd)
|
||||
## DGM assert ret.returncode == 0
|
||||
## DGM
|
||||
## DGM test_cmd = f"systemctl restart {test_item}"
|
||||
## DGM ret = salt_call_cli.run("--local", "cmd.run", test_cmd)
|
||||
## DGM assert ret.returncode == 0
|
||||
## DGM
|
||||
## DGM time.sleep(10)
|
||||
## DGM
|
||||
## DGM test_cmd = f"systemctl show -p UnitFileState {test_item}"
|
||||
## DGM ret = salt_call_cli.run("--local", "cmd.run", test_cmd)
|
||||
## DGM test_enabled = ret.stdout.strip().split("=")[1].split('"')[0].strip()
|
||||
## DGM print(
|
||||
## DGM f"DGM salt_systemd_setup UnitFileState '{test_item}', test_enabled '{test_enabled}', ret '{ret}'",
|
||||
## DGM flush=True,
|
||||
## DGM )
|
||||
## DGM assert ret.returncode == 0
|
||||
|
||||
|
||||
def _get_running_named_salt_pid(process_name):
|
||||
|
||||
|
|
@ -51,33 +19,30 @@ def _get_running_named_salt_pid(process_name):
|
|||
pids = []
|
||||
for proc in psutil.process_iter():
|
||||
cmdl_strg = " ".join(str(element) for element in proc.cmdline())
|
||||
print(
|
||||
f"DGM _get_running_named_salt_pid, process_name '{process_name}', command line string '{cmdl_strg}', proc cmdline '{proc.cmdline()}'",
|
||||
flush=True,
|
||||
)
|
||||
if process_name in cmdl_strg:
|
||||
pids.append(proc.pid)
|
||||
|
||||
return pids
|
||||
|
||||
|
||||
## DGM def test_salt_downgrade_minion(salt_call_cli, install_salt, salt_systemd_setup):
|
||||
def test_salt_downgrade_minion(salt_call_cli, install_salt):
|
||||
"""
|
||||
Test an downgrade of Salt Minion.
|
||||
"""
|
||||
print(
|
||||
f"DGM test_salt_downgrade_minion, install_salt prev_version, '{install_salt.prev_version}'",
|
||||
flush=True,
|
||||
)
|
||||
is_restart_fixed = packaging.version.parse(
|
||||
install_salt.prev_version
|
||||
) < packaging.version.parse("3006.9")
|
||||
|
||||
if is_restart_fixed and install_salt.distro_id in ("ubuntu", "debian"):
|
||||
pytest.skip(
|
||||
"Skip package test for Debian and Ubuntu, since downgrade version is less than "
|
||||
"3006.9 which had fixes for salt-minion restarting, see PR 66218"
|
||||
)
|
||||
|
||||
is_downgrade_to_relenv = packaging.version.parse(
|
||||
install_salt.prev_version
|
||||
) >= packaging.version.parse("3006.0")
|
||||
|
||||
print(
|
||||
f"DGM test_salt_downgrade_minion, install_salt prev_version, '{install_salt.prev_version}', is_downgrade_to_relenv '{is_downgrade_to_relenv}'",
|
||||
flush=True,
|
||||
)
|
||||
if is_downgrade_to_relenv:
|
||||
original_py_version = install_salt.package_python_version()
|
||||
|
||||
|
|
@ -106,10 +71,6 @@ def test_salt_downgrade_minion(salt_call_cli, install_salt):
|
|||
process_name = "salt-minion"
|
||||
|
||||
old_minion_pids = _get_running_named_salt_pid(process_name)
|
||||
print(
|
||||
f"DGM test_salt_downgrade_minion, old_minion_pids '{old_minion_pids}'",
|
||||
flush=True,
|
||||
)
|
||||
assert old_minion_pids
|
||||
|
||||
# Downgrade Salt to the previous version and test
|
||||
|
|
@ -117,44 +78,9 @@ def test_salt_downgrade_minion(salt_call_cli, install_salt):
|
|||
|
||||
time.sleep(60) # give it some time
|
||||
|
||||
# earlier versions od Salt 3006.x did not preserve systemd settings, hence ensure restart
|
||||
# pylint: disable=pointless-statement
|
||||
print("DGM test_salt_downgrade_minion, post-downgraded", flush=True)
|
||||
## DGM salt_systemd_setup
|
||||
# ensure known state, enabled and active
|
||||
test_list = ["salt-minion"]
|
||||
for test_item in test_list:
|
||||
test_cmd = f"systemctl enable {test_item}"
|
||||
ret = salt_call_cli.run("--local", "cmd.run", test_cmd)
|
||||
assert ret.returncode == 0
|
||||
|
||||
test_cmd = f"systemctl restart {test_item}"
|
||||
ret = salt_call_cli.run("--local", "cmd.run", test_cmd)
|
||||
assert ret.returncode == 0
|
||||
|
||||
time.sleep(10)
|
||||
|
||||
test_cmd = f"systemctl show -p UnitFileState {test_item}"
|
||||
ret = salt_call_cli.run("--local", "cmd.run", test_cmd)
|
||||
test_enabled = ret.stdout.strip().split("=")[1].split('"')[0].strip()
|
||||
print(
|
||||
f"DGM salt_systemd_setup UnitFileState '{test_item}', test_enabled '{test_enabled}', ret '{ret}'",
|
||||
flush=True,
|
||||
)
|
||||
assert ret.returncode == 0
|
||||
print("DGM test_salt_downgrade_minion, post-salt_systemd_setup", flush=True)
|
||||
|
||||
time.sleep(60) # give it some time
|
||||
|
||||
print("DGM test_salt_downgrade_minion, done-downgraded", flush=True)
|
||||
|
||||
# Verify there is a new running minion by getting its PID and comparing it
|
||||
# with the PID from before the upgrade
|
||||
new_minion_pids = _get_running_named_salt_pid(process_name)
|
||||
print(
|
||||
f"DGM test_salt_downgrade_minion, new_minion_pids '{new_minion_pids}'",
|
||||
flush=True,
|
||||
)
|
||||
assert new_minion_pids
|
||||
assert new_minion_pids != old_minion_pids
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue