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

Merge 3006.x into 3007.x

Browse source
This commit is contained in:
Pedro Algarvio 2024-05-10 19:28:25 +01:00
commit d52e0e836b
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/testsuite/__init__.py
View file

@ -46,7 +46,7 @@ ts = command_group(name="ts", help="Test Suite Related Commands", description=__
}, },
"arch": { "arch": {
"help": "The onedir artifact architecture", "help": "The onedir artifact architecture",
"choices": ("x86_64", "aarch64", "amd64", "x86"), "choices": ("x86_64", "arm64", "amd64", "x86"),
}, },
"slug": { "slug": {
"help": "The OS slug", "help": "The OS slug",
@ -106,7 +106,7 @@ def setup_testsuite(
ctx.exit(1) ctx.exit(1)
if "arm64" in slug: if "arm64" in slug:
arch = "aarch64" arch = "arm64"
ctx.warn( ctx.warn(
"Consider this in preliminary support. There are most likely things to iron out still." "Consider this in preliminary support. There are most likely things to iron out still."

30
tools/utils/gh.py
View file

@ -40,15 +40,15 @@ def download_onedir_artifact(
) )
return ExitCode.FAIL return ExitCode.FAIL
else: else:
if arch == "arm64": if arch == "aarch64":
ctx.info(f"Turning passed arch {arch!r} into 'aarch64'") ctx.info(f"Turning passed arch {arch!r} into 'arm64'")
arch = "aarch64" arch = "arm64"
elif arch == "x64": elif arch == "x64":
ctx.info(f"Turning passed arch {arch!r} into 'x86_64'") ctx.info(f"Turning passed arch {arch!r} into 'x86_64'")
arch = "x86_64" arch = "x86_64"
if arch not in ("x86_64", "aarch64"): if arch not in ("x86_64", "arm64"):
ctx.error( ctx.error(
f"The allowed values for '--arch' on {platform.title()} are 'x86_64', 'aarch64' or 'arm64'" f"The allowed values for '--arch' on {platform.title()} are 'x86_64' or 'arm64'"
) )
return ExitCode.FAIL return ExitCode.FAIL
artifacts_path = tools.utils.REPO_ROOT / "artifacts" artifacts_path = tools.utils.REPO_ROOT / "artifacts"
@ -129,15 +129,15 @@ def download_nox_artifact(
) )
return ExitCode.FAIL return ExitCode.FAIL
else: else:
if arch == "arm64": if arch == "aarch64":
ctx.info(f"Turning passed arch {arch!r} into 'aarch64'") ctx.info(f"Turning passed arch {arch!r} into 'arm64'")
arch = "aarch64" arch = "arm64"
elif arch == "x64": elif arch == "x64":
ctx.info(f"Turning passed arch {arch!r} into 'x86_64'") ctx.info(f"Turning passed arch {arch!r} into 'x86_64'")
arch = "x86_64" arch = "x86_64"
if arch not in ("x86_64", "aarch64"): if arch not in ("x86_64", "arm64"):
ctx.error( ctx.error(
f"The allowed values for '--arch' on {platform.title()} are 'x86_64', 'aarch64' or 'arm64'" f"The allowed values for '--arch' on {platform.title()} are 'x86_64' or 'arm64'"
) )
return ExitCode.FAIL return ExitCode.FAIL
@ -204,15 +204,15 @@ def download_pkgs_artifact(
return ExitCode.FAIL return ExitCode.FAIL
artifact_name += f"{arch}-MSI" artifact_name += f"{arch}-MSI"
else: else:
if arch == "arm64": if arch == "aarch64":
ctx.info(f"Turning passed arch {arch!r} into 'aarch64'") ctx.info(f"Turning passed arch {arch!r} into 'arm64'")
arch = "aarch64" arch = "arm64"
elif arch == "x64": elif arch == "x64":
ctx.info(f"Turning passed arch {arch!r} into 'x86_64'") ctx.info(f"Turning passed arch {arch!r} into 'x86_64'")
arch = "x86_64" arch = "x86_64"
if arch not in ("x86_64", "aarch64"): if arch not in ("x86_64", "arm64"):
ctx.error( ctx.error(
f"The allowed values for '--arch' for {slug} are 'x86_64', 'aarch64' or 'arm64'" f"The allowed values for '--arch' for {slug} are 'x86_64' or 'arm64'"
) )
return ExitCode.FAIL return ExitCode.FAIL