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

Fix amazon linux 2 tests

Browse source
This commit is contained in:
Megan Wilhite 2023-10-19 13:57:58 -06:00 • committed by Pedro Algarvio
parent 1c312ca9c0
commit 66bdc36a31
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/tests/support/helpers.py
View file

@ -516,7 +516,7 @@ class SaltPkgInstall:
gpg_key = "SALT-PROJECT-GPG-PUBKEY-2023.pub"
if platform.is_aarch64():
arch = "aarch64"
arch = "arm64"
else:
arch = "x86_64"
ret = self.proc.run(

2
tests/pytests/functional/modules/test_pkg.py
View file

@ -64,6 +64,8 @@ def test_pkg(grains):
elif grains["os_family"] == "RedHat":
if grains["os"] == "VMware Photon OS":
_pkg = "snoopy"
elif grains["osfinger"] == "Amazon Linux-2023":
return "dnf-utils"
else:
_pkg = "units"
elif grains["os_family"] == "Debian":

6
tests/pytests/functional/states/pkgrepo/test_centos.py
View file

@ -237,7 +237,11 @@ def test_pkgrepo_with_comments(pkgrepo, pkgrepo_with_comments_name, subtests):
@pytest.fixture
def copr_pkgrepo_with_comments_name(pkgrepo, grains):
if grains["osfinger"] in ("CentOS Linux-7") or grains["os"] == "VMware Photon OS":
if (
grains["osfinger"] in ("CentOS Linux-7")
or grains["os"] == "VMware Photon OS"
or grains["osfinger"] == "Amazon Linux-2"
):
pytest.skip("copr plugin not installed on {} CI".format(grains["osfinger"]))
if (
grains["os"] in ("CentOS Stream", "AlmaLinux")