saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Additional fixes for mac and windows upgrade tests

Browse source
This commit is contained in:
MKLeb 2023-06-21 18:35:42 -04:00 • committed by Gareth J. Greenaway
parent f952418e90
commit 0d622479b2
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/tests/support/helpers.py
View file

@ -758,9 +758,11 @@ class SaltPkgInstall:
win_pkg_url = f"https://repo.saltproject.io/salt/py3/windows/{full_version}/{win_pkg}"
else:
if self.file_ext == "msi":
win_pkg = f"Salt-Minion-{self.prev_version}-1-Py3-AMD64.{self.file_ext}"
win_pkg = (
f"Salt-Minion-{self.prev_version}-Py3-AMD64.{self.file_ext}"
)
elif self.file_ext == "exe":
win_pkg = f"Salt-Minion-{self.prev_version}-1-Py3-AMD64-Setup.{self.file_ext}"
win_pkg = f"Salt-Minion-{self.prev_version}-Py3-AMD64-Setup.{self.file_ext}"
win_pkg_url = f"https://repo.saltproject.io/salt/py3/windows/{major_ver}/{win_pkg}"
else:
if self.file_ext == "msi":
@ -803,7 +805,7 @@ class SaltPkgInstall:
mac_pkg = f"salt-{self.prev_version}-macos-x86_64.pkg"
mac_pkg_url = f"https://repo.saltproject.io/salt/py3/macos/{self.prev_version}/{mac_pkg}"
else:
mac_pkg = f"salt-{self.prev_version}-x86_64.pkg"
mac_pkg = f"salt-{self.prev_version}-py3-x86_64.pkg"
mac_pkg_url = f"https://repo.saltproject.io/salt/py3/macos/{major_ver}/{mac_pkg}"
mac_pkg_path = f"/tmp/{mac_pkg}"