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 4

Allow for arm64 or x86_64 when testing MacOS

Browse source
This commit is contained in:
David Murphy 2024-08-07 07:46:52 -06:00 • committed by Daniel Wozniak
parent 496bb08b58
commit 4e41a00ef9
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tests/support/pkg.py
View file

@ -837,14 +837,21 @@ class SaltPkgInstall:
self._install_ssm_service()
elif platform.is_darwin():
if relenv and platform.is_aarch64():
arch = "arm64"
elif platform.is_aarch64() and self.classic:
arch = "arm64"
else:
arch = "x86_64"
if self.classic:
mac_pkg = f"salt-{self.prev_version}-py3-x86_64.pkg"
mac_pkg = f"salt-{self.prev_version}-py3-{arch}.pkg"
mac_pkg_url = f"https://repo.saltproject.io/osx/{mac_pkg}"
else:
if not relenv:
mac_pkg = f"salt-{self.prev_version}-1-macos-x86_64.pkg"
mac_pkg = f"salt-{self.prev_version}-1-macos-{arch}.pkg"
else:
mac_pkg = f"salt-{self.prev_version}-py3-x86_64.pkg"
mac_pkg = f"salt-{self.prev_version}-py3-{arch}.pkg"
mac_pkg_url = (
f"https://repo.saltproject.io/salt/py3/macos/{major_ver}/{mac_pkg}"
)