Skip to content

Commit 79d4ff7

Browse files
twangboydwoz
twangboy
authored and
dwoz
committed
Change repo.saltproject.io to new url
1 parent 6f387de commit 79d4ff7

File tree

17 files changed

+168
-286
lines changed

17 files changed

+168
-286
lines changed

‎README.rst

+3-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ for more information.
9494

9595
To download and install Salt, see:
9696
* `The Salt install guide <https://docs.saltproject.io/salt/install-guide/en/latest/index.html>`_
97-
* `Salt Project repository <https://repo.saltproject.io/>`_
97+
* `Salt Project repository <https://packages.broadcom.com/artifactory/saltproject-generic/>`_
98+
* `Salt Project debian repository <https://packages.broadcom.com/artifactory/saltproject-deb/>`_
99+
* `Salt Project redhat repository <https://packages.broadcom.com/artifactory/saltproject-rpm/>`_
98100

99101

100102
Technical support

‎doc/_themes/saltstack2/layout.html

+5-10
Original file line numberDiff line numberDiff line change
@@ -163,16 +163,11 @@
163163
<!-- Collect the nav links, forms, and other content for toggling -->
164164
<div class="collapse navbar-collapse" id="navbarCollapse">
165165
<ul class="nav navbar-nav">
166-
<li><a href="/en/latest/">Overview</a></li>
167-
<li><a href="https://docs.saltproject.io/salt/user-guide/en/latest/">Salt User Guide</a></li>
168-
<li><a href="/en/latest/contents.html">Documentation</a></li>
169-
<li><a href="https://repo.saltproject.io">Downloads</a></li>
170-
<li><a href="/en/latest/topics/development/">Develop</a></li>
171-
<!--<li><a href="/en/2016.3/faq/">FAQ</a></li>
172-
<li><a href="/en/2016.3/samples/">Code Samples</a></li>-->
173-
<!-- <li><a href="https://repo.saltproject.io" target="_blank">Downloads</a></li>-->
174-
<!--<li><a href="http://saltstack.com/training" target="_blank">Training</a></li>
175-
<li><a href="http://saltstack.com/support" target="_blank">Support</a></li>-->
166+
<li><a href="/en/latest/">Overview</a></li>
167+
<li><a href="https://docs.saltproject.io/salt/user-guide/en/latest/">Salt User Guide</a></li>
168+
<li><a href="/en/latest/contents.html">Documentation</a></li>
169+
<li><a href="https://packages.broadcom.com/artifactory/saltproject-generic/">Downloads</a></li>
170+
<li><a href="/en/latest/topics/development/">Develop</a></li>
176171
</ul>
177172
</div>
178173
</div>

‎doc/conf.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -184,17 +184,17 @@
184184
.. |windownload| raw:: html
185185
186186
<p>Python3 x86: <a
187-
href="https://repo.saltproject.io/windows/Salt-Minion-{release}-Py3-x86-Setup.exe"><strong>Salt-Minion-{release}-x86-Setup.exe</strong></a>
188-
| <a href="https://repo.saltproject.io/windows/Salt-Minion-{release}-Py3-x86-Setup.exe.md5"><strong>md5</strong></a></p>
187+
href="https://packages.broadcom.com/artifactory/saltproject-generic/windows/{release}/Salt-Minion-{release}-Py3-x86-Setup.exe"><strong>Salt-Minion-{release}-x86-Setup.exe</strong></a>
188+
| <a href="https://packages.broadcom.com/artifactory/saltproject-generic/windows/{release}/Salt-Minion-{release}-Py3-x86-Setup.exe.md5"><strong>md5</strong></a></p>
189189
190190
<p>Python3 AMD64: <a
191-
href="https://repo.saltproject.io/windows/Salt-Minion-{release}-Py3-AMD64-Setup.exe"><strong>Salt-Minion-{release}-AMD64-Setup.exe</strong></a>
192-
| <a href="https://repo.saltproject.io/windows/Salt-Minion-{release}-Py3-AMD64-Setup.exe.md5"><strong>md5</strong></a></p>
191+
href="https://packages.broadcom.com/artifactory/saltproject-generic/windows/{release}/Salt-Minion-{release}-Py3-AMD64-Setup.exe"><strong>Salt-Minion-{release}-AMD64-Setup.exe</strong></a>
192+
| <a href="https://packages.broadcom.com/artifactory/saltproject-generic/windows/{release}/Salt-Minion-{release}-Py3-AMD64-Setup.exe.md5"><strong>md5</strong></a></p>
193193
194194
.. |osxdownloadpy3| raw:: html
195195
196-
<p>x86_64: <a href="https://repo.saltproject.io/osx/salt-{release}-py3-x86_64.pkg"><strong>salt-{release}-py3-x86_64.pkg</strong></a>
197-
| <a href="https://repo.saltproject.io/osx/salt-{release}-py3-x86_64.pkg.md5"><strong>md5</strong></a></p>
196+
<p>x86_64: <a href="https://packages.broadcom.com/artifactory/saltproject-generic/macos/{release}/salt-{release}-py3-x86_64.pkg"><strong>salt-{release}-py3-x86_64.pkg</strong></a>
197+
| <a href="https://packages.broadcom.com/artifactory/saltproject-generic/macos/{release}/salt-{release}-py3-x86_64.pkg.md5"><strong>md5</strong></a></p>
198198
199199
""".format(
200200
release=stripped_release

‎doc/ref/configuration/delta_proxy.rst

+2-4
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,8 @@ Before installing the delta proxy minion, ensure that:
146146
Install or upgrade Salt
147147
-----------------------
148148
Ensure your Salt masters are running at least Salt version 3004. For instructions
149-
on installing or upgrading Salt, see `repo.saltproject.io
150-
<http://repo.saltproject.io/>`_. For RedHat systems, see `Install or Upgrade Salt
151-
<https://enterprise.saltproject.io/en/latest/docs/install-salt.html>`_.
152-
149+
on installing or upgrading Salt, see the `Salt install guide
150+
<https://docs.saltproject.io/salt/install-guide>`_.
153151

154152

155153
.. _delta-proxy-install:

‎doc/topics/cloud/windows.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ from saltstack.com:
6262

6363
* `SaltStack Download Area`__
6464

65-
.. __: https://repo.saltproject.io/windows/
65+
.. __: https://packages.broadcom.com/artifactory/saltproject-generic/windows/
6666

6767
.. _new-pywinrm:
6868

‎salt/modules/saltutil.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ def _sync(form, saltenv=None, extmod_whitelist=None, extmod_blacklist=None):
124124
def update(version=None):
125125
"""
126126
Update the salt minion from the URL defined in opts['update_url']
127-
VMware, Inc provides the latest builds here:
128-
update_url: https://repo.saltproject.io/windows/
127+
Broadcom, Inc provides the latest builds here:
128+
update_url: https://packages.broadcom.com/artifactory/saltproject-generic/windows/
129129
130130
Be aware that as of 2014-8-11 there's a bug in esky such that only the
131131
latest version available in the update_url can be downloaded and installed.

‎salt/runners/manage.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ def bootstrap_psexec(
769769
770770
installer_url
771771
URL of minion installer executable. Defaults to the latest version from
772-
https://repo.saltproject.io/windows/
772+
https://packages.broadcom.com/artifactory/saltproject-generic/windows/
773773
774774
username
775775
Optional user name for login on remote computer.
@@ -787,6 +787,9 @@ def bootstrap_psexec(
787787
salt-run manage.bootstrap_psexec hosts='host1,host2' installer_url='http://exampledomain/salt-installer.exe'
788788
"""
789789

790+
# TODO: Need to make this gets the latest version from the new repo location
791+
# TODO: Similar to tests/support/win_installer.py
792+
# TODO: Maybe need to move that ^^^^ to a salt util
790793
if not installer_url:
791794
base_url = "https://repo.saltproject.io/windows/"
792795
source = urllib.request.urlopen(base_url).read()

‎salt/states/pkgrepo.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -99,17 +99,17 @@
9999
100100
.. code-block:: yaml
101101
102-
deb [signed-by=/etc/apt/keyrings/salt-archive-keyring.gpg arch=amd64] https://repo.saltproject.io/py3/ubuntu/18.04/amd64/latest bionic main:
102+
deb [signed-by=/etc/apt/keyrings/salt-archive-keyring.gpg arch=amd64] https://packages.broadcom.com/artifactory/saltproject-deb/ bionic main:
103103
pkgrepo.managed:
104104
- file: /etc/apt/sources.list.d/salt.list
105-
- key_url: https://repo.saltproject.io/py3/ubuntu/18.04/amd64/latest/salt-archive-keyring.gpg
105+
- key_url: https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
106106
- aptkey: False
107107
108108
Using ``aptkey: False`` with ``keyserver`` and ``keyid``:
109109
110110
.. code-block:: yaml
111111
112-
deb [signed-by=/etc/apt/keyrings/salt-archive-keyring.gpg arch=amd64] https://repo.saltproject.io/py3/ubuntu/18.04/amd64/latest bionic main:
112+
deb [signed-by=/etc/apt/keyrings/salt-archive-keyring.gpg arch=amd64] https://packages.broadcom.com/artifactory/saltproject-deb/ bionic main:
113113
pkgrepo.managed:
114114
- file: /etc/apt/sources.list.d/salt.list
115115
- keyserver: keyserver.ubuntu.com

‎tests/integration/modules/test_cp.py

+28-9
Original file line numberDiff line numberDiff line change
@@ -231,22 +231,32 @@ def test_get_url_https(self, tgt):
231231
"""
232232
cp.get_url with https:// source given
233233
"""
234-
self.run_function("cp.get_url", ["https://www.broadcom.com", tgt])
234+
self.run_function(
235+
"cp.get_url",
236+
["https://packages.broadcom.com/artifactory/saltproject-generic/", tgt],
237+
)
235238
with salt.utils.files.fopen(tgt, "r") as instructions:
236239
data = salt.utils.stringutils.to_unicode(instructions.read())
237-
self.assertIn("Broadcom Inc. is a global technology leader", data)
240+
self.assertIn("Index of saltproject", data)
241+
self.assertIn("onedir", data)
242+
self.assertIn("Artifactory Online Server", data)
238243
self.assertNotIn("AYBABTU", data)
239244

240245
@pytest.mark.slow_test
241246
def test_get_url_https_dest_empty(self):
242247
"""
243248
cp.get_url with https:// source given and destination omitted.
244249
"""
245-
ret = self.run_function("cp.get_url", ["https://www.broadcom.com"])
250+
ret = self.run_function(
251+
"cp.get_url",
252+
["https://packages.broadcom.com/artifactory/saltproject-generic/"],
253+
)
246254

247255
with salt.utils.files.fopen(ret, "r") as instructions:
248256
data = salt.utils.stringutils.to_unicode(instructions.read())
249-
self.assertIn("Broadcom Inc. is a global technology leader", data)
257+
self.assertIn("Index of saltproject", data)
258+
self.assertIn("onedir", data)
259+
self.assertIn("Artifactory Online Server", data)
250260
self.assertNotIn("AYBABTU", data)
251261

252262
@pytest.mark.slow_test
@@ -259,13 +269,20 @@ def test_get_url_https_no_dest(self):
259269
sleep = 5
260270
tgt = None
261271
while time.time() - start <= timeout:
262-
ret = self.run_function("cp.get_url", ["https://www.broadcom.com", tgt])
272+
ret = self.run_function(
273+
"cp.get_url",
274+
["https://packages.broadcom.com/artifactory/saltproject-generic/", tgt],
275+
)
263276
if ret.find("HTTP 599") == -1:
264277
break
265278
time.sleep(sleep)
266279
if ret.find("HTTP 599") != -1:
267-
raise Exception("https://www.broadcom.com returned 599 error")
268-
self.assertIn("Broadcom Inc. is a global technology leader", ret)
280+
raise Exception(
281+
"https://packages.broadcom.com/artifactory/saltproject-generic/ returned 599 error"
282+
)
283+
self.assertIn("Index of saltproject", ret)
284+
self.assertIn("onedir", ret)
285+
self.assertIn("Artifactory Online Server", ret)
269286
self.assertNotIn("AYBABTU", ret)
270287

271288
@pytest.mark.slow_test
@@ -334,9 +351,11 @@ def test_get_file_str_https(self):
334351
"""
335352
cp.get_file_str with https:// source given
336353
"""
337-
src = "https://www.broadcom.com"
354+
src = "https://packages.broadcom.com/artifactory/saltproject-generic/"
338355
ret = self.run_function("cp.get_file_str", [src])
339-
self.assertIn("Broadcom Inc. is a global technology leader", ret)
356+
self.assertIn("Index of saltproject", ret)
357+
self.assertIn("onedir", ret)
358+
self.assertIn("Artifactory Online Server", ret)
340359
self.assertNotIn("AYBABTU", ret)
341360

342361
@pytest.mark.slow_test

‎tests/pytests/functional/modules/test_aptpkg.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def build_repo_file():
104104
source_path = "/etc/apt/sources.list.d/source_test_list.list"
105105
try:
106106
test_repos = [
107-
"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",
107+
"deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] https://packages.broadcom.com/artifactory/saltproject-deb/ jammy main",
108108
"deb http://dist.list stable/all/",
109109
]
110110
with salt.utils.files.fopen(source_path, "w+") as fp:

‎tests/pytests/functional/modules/test_pkg.py

+2-6
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,8 @@ def test_mod_del_repo(grains, modules):
135135
elif grains["os_family"] == "RedHat":
136136
repo = "saltstack"
137137
name = "SaltStack repo for RHEL/CentOS {}".format(grains["osmajorrelease"])
138-
baseurl = "https://repo.saltproject.io/py3/redhat/{}/x86_64/latest/".format(
139-
grains["osmajorrelease"]
140-
)
141-
gpgkey = "https://repo.saltproject.io/py3/redhat/{}/x86_64/latest/SALTSTACK-GPG-KEY.pub".format(
142-
grains["osmajorrelease"]
143-
)
138+
baseurl = "https://packages.broadcom.com/artifactory/saltproject-rpm/"
139+
gpgkey = "https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public"
144140
gpgcheck = 1
145141
enabled = 1
146142
ret = modules.pkg.mod_repo(

‎tests/pytests/functional/states/pkgrepo/test_debian.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -661,8 +661,8 @@ def _default_fullname(self):
661661
@alt_repo.default
662662
def _default_alt_repo(self):
663663
"""
664-
Use an alternative repo, packages do not
665-
exist for the OS on repo.saltproject.io
664+
Use an alternative repo, packages do not exist for the OS on
665+
packages.broadcom.com
666666
"""
667667
if (
668668
self.grains["osfullname"] == "Ubuntu"
@@ -690,7 +690,7 @@ def _default_repo_file(self):
690690

691691
@repo_url.default
692692
def _default_repo_url(self):
693-
return f"https://repo.saltproject.io/py3/{self.fullname}/{self.grains['osrelease']}/{self.grains['osarch']}/latest"
693+
return "https://packages.broadcom.com/artifactory/saltproject-deb/"
694694

695695
@repo_content.default
696696
def _default_repo_content(self):
@@ -863,7 +863,7 @@ def test_adding_repo_file_signedby_alt_file(pkgrepo, states, repo):
863863
assert repo.repo_content in ret.comment
864864

865865
key_file = repo.key_file.parent / "salt-alt-key.gpg"
866-
repo_content = "deb [arch=amd64 signed-by={}] https://repo.saltproject.io/py3/debian/10/amd64/latest buster main".format(
866+
repo_content = "deb [arch=amd64 signed-by={}] https://packages.broadcom.com/artifactory/saltproject-deb/ buster main".format(
867867
str(key_file)
868868
)
869869
ret = states.pkgrepo.managed(
@@ -925,7 +925,7 @@ def _run(test=False):
925925
name=repo.repo_content,
926926
file=str(repo.repo_file),
927927
clean_file=True,
928-
key_url="https://repo.saltproject.io/salt/py3/ubuntu/20.04/amd64/latest/SALT-PROJECT-GPG-PUBKEY-2023.pub",
928+
key_url="https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public",
929929
aptkey=False,
930930
)
931931

‎tests/pytests/integration/netapi/test_ssh_client.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ def test_shell_inject_ssh_priv(
150150
"""
151151
# ZDI-CAN-11143
152152
path = tmp_path / "test-11143"
153-
tgts = ["repo.saltproject.io", "www.zerodayinitiative.com"]
153+
tgts = ["packages.broadcom.com", "www.zerodayinitiative.com"]
154154
ret = None
155155
for tgt in tgts:
156156
low = {

0 commit comments

Comments
 (0)