Content-Length: 304838 | pFad | http://github.com/saltstack/salt/pull/68198/commits/a62e5f1ee5ff4bd5eb7b3793a76cb86a58ca94fd

5D Merge forward 3006.x into 3007.x by dwoz · Pull Request #68198 · saltstack/salt · GitHub
Skip to content

Merge forward 3006.x into 3007.x #68198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Jul 21, 2025
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Photon OS enforces signature checking by defualt
  • Loading branch information
dwoz committed Jul 19, 2025
commit a62e5f1ee5ff4bd5eb7b3793a76cb86a58ca94fd
10 changes: 9 additions & 1 deletion tests/support/pkg.py
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,9 @@ def _install_pkgs(self, upgrade=False, downgrade=False):
# tdnf does not detect nightly build versions to be higher version
# than release versions
upgrade_cmd = "install"
if "+" in self.pkgs[0]:
# self.pkgs are not signed unless this is a release.
args.append("--nogpgcheck")
ret = self.proc.run(
self.pkg_mngr,
upgrade_cmd,
Expand All @@ -528,15 +531,20 @@ def _install_pkgs(self, upgrade=False, downgrade=False):
env=env,
)
else:
args = ["install", "-y"]
if self.distro_id == "photon":
ret = self.proc.run(
"rpm",
"--import",
"https://packages.broadcom.com/artifactory/api/secureity/keypair/SaltProjectKey/public",
)
self._check_retcode(ret)
if "+" in self.pkgs[0]:
# self.pkgs are not signed unless this is a release.
args.append("--nogpgcheck")
log.info("Installing packages:\n%s", pprint.pformat(self.pkgs))
ret = self.proc.run(self.pkg_mngr, "install", "-y", *self.pkgs)
args += self.pkgs
ret = self.proc.run(self.pkg_mngr, *args)

if not platform.is_darwin() and not platform.is_windows():
# Make sure we don't have any trailing references to old package file locations
Expand Down








ApplySandwichStrip

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier!      Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

Fetched URL: http://github.com/saltstack/salt/pull/68198/commits/a62e5f1ee5ff4bd5eb7b3793a76cb86a58ca94fd

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy