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

change repo.saltstack.com to repo.saltproject.io

Browse source
This commit is contained in:
Bryce Larson 2021-08-12 16:26:29 +00:00 • committed by Megan Wilhite
parent 0ff05246ff
commit c56da6cb1f
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/runners/manage.py
View file

@ -772,7 +772,7 @@ def bootstrap_psexec(
installer_url
URL of minion installer executable. Defaults to the latest version from
https://repo.saltstack.com/windows/
https://repo.saltproject.io/windows/
username
Optional user name for login on remote computer.
@ -791,7 +791,7 @@ def bootstrap_psexec(
"""
if not installer_url:
base_url = "https://repo.saltstack.com/windows/"
base_url = "https://repo.saltproject.io/windows/"
source = urllib.request.urlopen(base_url).read()
salty_rx = re.compile(
'>(Salt-Minion-(.+?)-(.+)-Setup.exe)</a></td><td align="right">(.*?)\\s*<'

12
tests/integration/modules/test_cp.py
View file

@ -234,7 +234,7 @@ class CPModuleTest(ModuleCase):
"""
cp.get_url with https:// source given
"""
self.run_function("cp.get_url", ["https://repo.saltstack.com/index.html", tgt])
self.run_function("cp.get_url", ["https://repo.saltproject.io/index.html", tgt])
with salt.utils.files.fopen(tgt, "r") as instructions:
data = salt.utils.stringutils.to_unicode(instructions.read())
self.assertIn("Bootstrap", data)
@ -247,7 +247,9 @@ class CPModuleTest(ModuleCase):
"""
cp.get_url with https:// source given and destination omitted.
"""
ret = self.run_function("cp.get_url", ["https://repo.saltstack.com/index.html"])
ret = self.run_function(
"cp.get_url", ["https://repo.saltproject.io/index.html"]
)
with salt.utils.files.fopen(ret, "r") as instructions:
data = salt.utils.stringutils.to_unicode(instructions.read())
@ -267,13 +269,13 @@ class CPModuleTest(ModuleCase):
tgt = None
while time.time() - start <= timeout:
ret = self.run_function(
"cp.get_url", ["https://repo.saltstack.com/index.html", tgt]
"cp.get_url", ["https://repo.saltproject.io/index.html", tgt]
)
if ret.find("HTTP 599") == -1:
break
time.sleep(sleep)
if ret.find("HTTP 599") != -1:
raise Exception("https://repo.saltstack.com/index.html returned 599 error")
raise Exception("https://repo.saltproject.io/index.html returned 599 error")
self.assertIn("Bootstrap", ret)
self.assertIn("Debian", ret)
self.assertIn("Windows", ret)
@ -345,7 +347,7 @@ class CPModuleTest(ModuleCase):
"""
cp.get_file_str with https:// source given
"""
src = "https://repo.saltstack.com/index.html"
src = "https://repo.saltproject.io/index.html"
ret = self.run_function("cp.get_file_str", [src])
self.assertIn("Bootstrap", ret)
self.assertIn("Debian", ret)

2
tests/support/win_installer.py
View file

@ -14,7 +14,7 @@ import hashlib
import requests
PREFIX = "Salt-Minion-"
REPO = "https://repo.saltstack.com/windows"
REPO = "https://repo.saltproject.io/windows"
def latest_installer_name(arch="AMD64", **kwargs):