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

prepare for https://github.com/saltstack/salt/issues/60792

Browse source
This commit is contained in:
Bryce Larson 2021-10-20 18:10:19 +00:00 • committed by Megan Wilhite
parent 036f3597ed
commit 17288e4fd8
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/windows/build_pkg.bat
View file

@ -136,7 +136,7 @@ If Defined ProgramFiles(x86) goto dependencies_x64
@echo.
@echo Copying VCRedist 2013 X86 to Prerequisites
@echo ----------------------------------------------------------------------
set Url=http://repo.saltproject.io/windows/dependencies/32/vcredist_x86_2013.exe
set Url=https://repo.saltproject.io/windows/dependencies/32/vcredist_x86_2013.exe
set Name=vcredist_x86_2013.exe
@echo - Downloading %Name%
powershell -ExecutionPolicy RemoteSigned -File download_url_file.ps1 -url %Url% -file "%PreDir%\%Name%"
@ -144,7 +144,7 @@ powershell -ExecutionPolicy RemoteSigned -File download_url_file.ps1 -url %Url%
@echo.
@echo Copying Universal C Runtimes X86 to Prerequisites
@echo ----------------------------------------------------------------------
set Url=http://repo.saltproject.io/windows/dependencies/32/ucrt_x86.zip
set Url=https://repo.saltproject.io/windows/dependencies/32/ucrt_x86.zip
set Name=ucrt_x86.zip
@echo - Downloading %Name%
powershell -ExecutionPolicy RemoteSigned -File download_url_file.ps1 -url %Url% -file "%PreDir%\%Name%"
@ -156,7 +156,7 @@ goto prereq_end
@echo.
@echo Copying VCRedist 2013 X64 to Prerequisites
@echo ----------------------------------------------------------------------
set Url=http://repo.saltproject.io/windows/dependencies/64/vcredist_x64_2013.exe
set Url=https://repo.saltproject.io/windows/dependencies/64/vcredist_x64_2013.exe
set Name=vcredist_x64_2013.exe
@echo - Downloading %Name%
powershell -ExecutionPolicy RemoteSigned -File download_url_file.ps1 -url %Url% -file "%PreDir%\%Name%"
@ -164,7 +164,7 @@ powershell -ExecutionPolicy RemoteSigned -File download_url_file.ps1 -url %Url%
@echo.
@echo Copying Universal C Runtimes X64 to Prerequisites
@echo ----------------------------------------------------------------------
set Url=http://repo.saltproject.io/windows/dependencies/64/ucrt_x64.zip
set Url=https://repo.saltproject.io/windows/dependencies/64/ucrt_x64.zip
set Name=ucrt_x64.zip
@echo - Downloading %Name%
powershell -ExecutionPolicy RemoteSigned -File download_url_file.ps1 -url %Url% -file "%PreDir%\%Name%"

2
tests/pytests/functional/modules/test_pkg.py
View file

@ -104,7 +104,7 @@ def test_mod_del_repo(grains, modules):
elif grains["os_family"] == "RedHat":
repo = "saltstack"
name = "SaltStack repo for RHEL/CentOS {}".format(grains["osmajorrelease"])
baseurl = "http://repo.saltproject.io/py3/redhat/{}/x86_64/latest/".format(
baseurl = "https://repo.saltproject.io/py3/redhat/{}/x86_64/latest/".format(
grains["osmajorrelease"]
)
gpgkey = "https://repo.saltproject.io/py3/redhat/{}/x86_64/latest/SALTSTACK-GPG-KEY.pub".format(