mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 02:00:20 +00:00
We are updating th paths for 3006.5 now
This commit is contained in:
parent
7b24b91450
commit
92e2d79fb6
2 changed files with 5 additions and 4 deletions
|
@ -547,10 +547,10 @@ class SaltPkgInstall:
|
|||
|
||||
if platform.is_aarch64():
|
||||
arch = "arm64"
|
||||
# Starting with 3007.0, we prioritize the aarch64 repo paths for rpm-based distros
|
||||
# Starting with 3006.5, we prioritize the aarch64 repo paths for rpm-based distros
|
||||
if packaging.version.parse(
|
||||
self.prev_version
|
||||
) >= packaging.version.parse("3007.0"):
|
||||
) >= packaging.version.parse("3006.5"):
|
||||
arch = "aarch64"
|
||||
else:
|
||||
arch = "x86_64"
|
||||
|
|
|
@ -828,11 +828,12 @@ def pkg_matrix(
|
|||
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"):
|
||||
if backend == "relenv" and version >= tools.utils.Version("3006.5"):
|
||||
prefix.replace("/arm64/", "/aarch64/")
|
||||
# Using a paginator allows us to list recursively and avoid the item limit
|
||||
page_iterator = paginator.paginate(
|
||||
Bucket=f"salt-project-{tools.utils.SPB_ENVIRONMENT}-salt-artifacts-release", Prefix=prefix
|
||||
Bucket=f"salt-project-{tools.utils.SPB_ENVIRONMENT}-salt-artifacts-release",
|
||||
Prefix=prefix,
|
||||
)
|
||||
# Uses a jmespath expression to test if the wanted version is in any of the filenames
|
||||
key_filter = f"Contents[?contains(Key, '{version}')][]"
|
||||
|
|
Loading…
Add table
Reference in a new issue