saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use artifact version for pkg name

Browse source
This commit is contained in:
Daniel A. Wozniak 2024-06-05 09:11:43 -07:00 • committed by Daniel Wozniak
parent 580d8b2851
commit 4523450ddf
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
tests/pytests/pkg/integration/test_pkg_meta.py
View file

@ -24,13 +24,18 @@ def provides_arch():
@pytest.fixture @pytest.fixture
def package(version, pkg_arch): def artifact_version(install_salt):
name = f"salt-{version}-0.{pkg_arch}.rpm" return install_salt.artifact_version
@pytest.fixture
def package(artifact_version, pkg_arch):
name = f"salt-{artifact_version}-0.{pkg_arch}.rpm"
return ARTIFACTS_DIR / name return ARTIFACTS_DIR / name
@pytest.mark.skipif(not salt.utils.path.which("rpm"), reason="rpm is not installed") @pytest.mark.skipif(not salt.utils.path.which("rpm"), reason="rpm is not installed")
def test_provides(install_salt, package, version, provides_arch): def test_provides(install_salt, package, artifact_version, provides_arch):
if install_salt.downgrade or install_salt.upgrade: if install_salt.downgrade or install_salt.upgrade:
pytest.skip("Only test on install pkg tests") pytest.skip("Only test on install pkg tests")
if install_salt.distro_id not in ( if install_salt.distro_id not in (
@ -46,10 +51,10 @@ def test_provides(install_salt, package, version, provides_arch):
assert package.exists() assert package.exists()
valid_provides = [ valid_provides = [
f"config: config(salt) = {version}-0", f"config: config(salt) = {artifact_version}-0",
f"manual: salt = {version}", f"manual: salt = {artifact_version}",
f"manual: salt = {version}-0", f"manual: salt = {artifact_version}-0",
f"manual: salt({provides_arch}) = {version}-0", f"manual: salt({provides_arch}) = {artifact_version}-0",
] ]
proc = subprocess.run( proc = subprocess.run(
["rpm", "-q", "-v", "-provides", package], capture_output=True, check=True ["rpm", "-q", "-v", "-provides", package], capture_output=True, check=True
@ -63,7 +68,7 @@ def test_provides(install_salt, package, version, provides_arch):
@pytest.mark.skipif(not salt.utils.path.which("rpm"), reason="rpm is not installed") @pytest.mark.skipif(not salt.utils.path.which("rpm"), reason="rpm is not installed")
def test_requires(install_salt, package, version): def test_requires(install_salt, package, artifact_version):
if install_salt.downgrade or install_salt.upgrade: if install_salt.downgrade or install_salt.upgrade:
pytest.skip("Only test on install pkg tests") pytest.skip("Only test on install pkg tests")
if install_salt.distro_id not in ( if install_salt.distro_id not in (
@ -85,7 +90,7 @@ def test_requires(install_salt, package, version):
"manual: /usr/sbin/groupadd", "manual: /usr/sbin/groupadd",
"manual: /usr/sbin/useradd", "manual: /usr/sbin/useradd",
"manual: /usr/sbin/usermod", "manual: /usr/sbin/usermod",
f"config: config(salt) = {version}-0", f"config: config(salt) = {artifact_version}-0",
"manual: dmidecode", "manual: dmidecode",
"manual: openssl", "manual: openssl",
"manual: pciutils", "manual: pciutils",