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

Make some variables more clear

Browse source
This commit is contained in:
MKLeb 2023-10-24 16:23:22 -04:00 • committed by Pedro Algarvio
parent 81bca8d4c3
commit f1c9463b6d
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tools/ci.py
View file

@ -770,14 +770,14 @@ def pkg_matrix(
)
ctx.exit(1)
adj_versions = []
adjusted_versions = []
for ver in testing_releases:
if ver < tools.utils.Version("3006.0"):
adj_versions.append((ver, "classic"))
adj_versions.append((ver, "tiamat"))
adjusted_versions.append((ver, "classic"))
adjusted_versions.append((ver, "tiamat"))
else:
adj_versions.append((ver, "relenv"))
ctx.info(f"Will look for the following versions: {adj_versions}")
adjusted_versions.append((ver, "relenv"))
ctx.info(f"Will look for the following versions: {adjusted_versions}")
# Filter out the prefixes to look under
if "macos-" in distro_slug:
@ -816,14 +816,14 @@ def pkg_matrix(
s3 = boto3.client("s3")
paginator = s3.get_paginator("list_objects_v2")
matrix = [
_matrix = [
{
"test-chunk": "install",
"version": None,
}
]
for version, backend in adj_versions:
for version, backend in adjusted_versions:
prefix = prefixes[backend]
# TODO: Remove this after 3009.0
if backend == "relenv" and version >= tools.utils.Version("3007.0"):
@ -850,7 +850,7 @@ def pkg_matrix(
f"Found {version} ({backend}) for {distro_slug}: {objects[0]['Key']}"
)
for session in ("upgrade", "downgrade"):
matrix.append(
_matrix.append(
{
"test-chunk": f"{session}-classic"
if backend == "classic"
@ -862,11 +862,11 @@ def pkg_matrix(
ctx.info(f"No {version} ({backend}) for {distro_slug} at {prefix}")
ctx.info("Generated matrix:")
ctx.print(matrix, soft_wrap=True)
ctx.print(_matrix, soft_wrap=True)
if github_output is not None:
with open(github_output, "a", encoding="utf-8") as wfh:
wfh.write(f"matrix={json.dumps(matrix)}\n")
wfh.write(f"matrix={json.dumps(_matrix)}\n")
ctx.exit(0)