Change repo.saltproject.io to new url #67024
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dmurphy18
requested changes
Nov 12, 2024
| @@ -104,7 +104,7 @@ def build_repo_file(): | |||
| source_path = "/etc/apt/sources.list.d/source_test_list.list" | |||
| try: | |||
| test_repos = [ | |||
| "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] https://repo.saltproject.io/salt/py3/ubuntu/22.04/amd64/latest jammy main", | |||
| "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] https://packages.broadcom.com/artifactory/saltproject-deb/ jammy main", | |||
There was a problem hiding this comment.
we are using salt.sources now , see https://docs.saltproject.io/salt/install-guide/en/latest/topics/install-by-operating-system/linux-deb.html
| @@ -863,7 +863,7 @@ def test_adding_repo_file_signedby_alt_file(pkgrepo, states, repo): | |||
| assert repo.repo_content in ret.comment | |||
|
|
|||
| key_file = repo.key_file.parent / "salt-alt-key.gpg" | |||
| repo_content = "deb [arch=amd64 signed-by={}] https://repo.saltproject.io/py3/debian/10/amd64/latest buster main".format( | |||
| repo_content = "deb [arch=amd64 signed-by={}] https://packages.broadcom.com/artifactory/saltproject-deb/ buster main".format( | |||
There was a problem hiding this comment.
| "salt-cloud", | ||
| "salt-api", | ||
| "salt-debuginfo", | ||
| f"salt-master-{salt_release}", |
There was a problem hiding this comment.
for rpm it is 👍
salt-minion=3006.8
| ) | ||
| with salt.utils.files.fopen( | ||
| pathlib.Path("/etc", "apt", "sources.list.d", "salt.list"), "w" | ||
| ) as fp: | ||
| fp.write( | ||
| f"deb [signed-by=/etc/apt/keyrings/{gpg_dest} arch={arch}] " | ||
| f"https://repo.saltproject.io/{root_url}{distro_name}/{self.distro_version}/{arch}/{major_ver} {self.distro_codename} main" | ||
| f"deb [signed-by={gpg_full_path} arch={arch}] " |
There was a problem hiding this comment.
| f"https://repo.saltproject.io/salt/py3/macos/{major_ver}/{mac_pkg}" | ||
| ) | ||
| mac_pkg = f"salt-{self.prev_version}-py3-{arch}.pkg" | ||
| mac_pkg_url = f"{root_url}/saltproject-generic/macos/{major_ver}/{mac_pkg}" |
There was a problem hiding this comment.
it is {major_ver}.{minor_ver}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
This is a first attempt to change URLs from repo.saltproject.io to packages.broadcom.com. I'm not addressing any workflow stuff here.