Update salt url, update amis for windows

This commit is contained in:
twangboy 2021-05-03 18:16:57 -06:00 committed by Gareth J. Greenaway
parent abadcd3e01
commit 5aed369606
4 changed files with 31 additions and 1 deletions

View file

@ -1,6 +1,7 @@
@Library('salt@master-1.11') _
runTestSuite(
ami_image_id: 'ami-0594ccae396fdcb60',
concurrent_builds: 1,
distro_name: 'windows',
distro_version: '2016',

View file

@ -1,6 +1,7 @@
@Library('salt@master-1.11') _
runTestSuite(
ami_image_id: 'ami-015e1fedb71c9afbf',
concurrent_builds: 1,
distro_name: 'windows',
distro_version: '2019',

View file

@ -501,7 +501,7 @@ class DownloadWindowsDlls(Command):
yield
platform_bits, _ = platform.architecture()
url = "https://repo.saltstack.com/windows/dependencies/{bits}/{fname}"
url = "https://repo.saltproject.io/windows/dependencies/{bits}/{fname}"
dest = os.path.join(os.path.dirname(sys.executable), "{fname}")
with indent_log():
for fname in (

View file

@ -0,0 +1,28 @@
import pytest
import salt.config
import salt.fileserver.roots as roots
pytestmark = [
pytest.mark.windows_whitelisted,
]
@pytest.fixture(scope="module")
def configure_loader_modules(base_env_state_tree_root_dir):
opts = salt.config.DEFAULT_MINION_OPTS.copy()
print(base_env_state_tree_root_dir)
opts["file_roots"]["base"] = [str(base_env_state_tree_root_dir)]
return {
roots: {
"__opts__": opts,
},
}
# nox -e pytest-zeromq-3.8(coverage=False) -- -vvv --run-slow --run-destructive tests\pytests\functional\fileserver\test_roots.py
def test_symlink_list(base_env_state_tree_root_dir):
with pytest.helpers.temp_file("target", "data", base_env_state_tree_root_dir) as target:
link = base_env_state_tree_root_dir / "link"
link.symlink_to(str(target))
ret = roots.symlink_list({"saltenv": "base"})
assert ret == {"link": str(target)}