From 4e41a00ef9780ed2298151876973cb92dc1ec1d0 Mon Sep 17 00:00:00 2001 From: David Murphy Date: Wed, 7 Aug 2024 07:46:52 -0600 Subject: [PATCH] Allow for arm64 or x86_64 when testing MacOS --- tests/support/pkg.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tests/support/pkg.py b/tests/support/pkg.py index f519adcbd82..066db28921e 100644 --- a/tests/support/pkg.py +++ b/tests/support/pkg.py @@ -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}" )