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

Force generate scripts for Salt master on windows package tests

Browse source
This commit is contained in:
Megan Wilhite 2023-08-29 09:55:59 -06:00 • committed by Pedro Algarvio
parent 4608a470b0
commit ab783334da
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkg/tests/conftest.py
View file

@ -392,6 +392,7 @@ def salt_master(salt_factories, install_salt, state_tree, pillar_tree):
if master_script:
salt_factories.system_service = False
salt_factories.generate_scripts = True
scripts_dir = salt_factories.root_dir / "Scripts"
scripts_dir.mkdir(exist_ok=True)
salt_factories.scripts_dir = scripts_dir
@ -401,13 +402,13 @@ def salt_master(salt_factories, install_salt, state_tree, pillar_tree):
python_executable = install_salt.bin_dir / "python.exe"
if install_salt.relenv:
python_executable = install_salt.install_dir / "Scripts" / "python.exe"
salt_factories.python_executable = python_executable
factory = salt_factories.salt_master_daemon(
random_string("master-"),
defaults=config_defaults,
overrides=config_overrides,
factory_class=SaltMasterWindows,
salt_pkg_install=install_salt,
python_executable=python_executable,
)
salt_factories.system_service = True
else: