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

Fix os filter for arm

Browse source
This commit is contained in:
Daniel A. Wozniak 2025-01-24 01:00:17 -07:00 • committed by Daniel Wozniak
parent c7a45fd32d
commit 9cb51fac91
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
tools/ci.py
View file

@ -1472,7 +1472,7 @@ def upload_coverage(ctx: Context, reports_path: pathlib.Path, commit_sha: str =
ctx.exit(0)
def _os_test_filter(osdef, transport, chunk):
def _os_test_filter(osdef, transport, chunk, arm_runner):
"""
Filter out some test runs based on os, tranport and chunk to be run.
"""
@ -1480,10 +1480,7 @@ def _os_test_filter(osdef, transport, chunk):
return False
if "macos" in osdef.slug and chunk == "scenarios":
return False
if osdef.arch == "arm64" and os.environ.get("LINUX_ARM_RUNNER", "0") not in (
"0",
"",
):
if not arm_runner:
return False
if transport == "tcp" and osdef.slug not in (
"rockylinux-9",
@ -1737,7 +1734,9 @@ def workflow_config(
**_.as_dict(),
)
for _ in TEST_SALT_LISTING[platform]
if _os_test_filter(_, transport, chunk)
if _os_test_filter(
_, transport, chunk, config["linux_arm_runner"]
)
]
else:
for arch in ["x86_64", "arm64"]:
@ -1754,7 +1753,12 @@ def workflow_config(
**_.as_dict(),
)
for _ in TEST_SALT_LISTING[platform]
if _os_test_filter(_, transport, chunk)
if _os_test_filter(
_,
transport,
chunk,
config["linux_arm_runner"],
)
and _.arch == arch
]
else:
@ -1767,7 +1771,9 @@ def workflow_config(
**_.as_dict(),
)
for _ in TEST_SALT_LISTING[platform]
if _os_test_filter(_, transport, chunk)
if _os_test_filter(
_, transport, chunk, config["linux_arm_runner"]
)
]
else:
for arch in ["x86_64", "arm64"]:
@ -1779,7 +1785,9 @@ def workflow_config(
**_.as_dict(),
)
for _ in TEST_SALT_LISTING[platform]
if _os_test_filter(_, transport, chunk)
if _os_test_filter(
_, transport, chunk, config["linux_arm_runner"]
)
and _.arch == arch
]