Skip to content

Commit 6988ffa

Browse files
twangboydwoz
authored andcommitted
Update bootstrap script to support Salt 3008 requirements files
1 parent 4ae77e5 commit 6988ffa

1 file changed

Lines changed: 13 additions & 3 deletions

File tree

salt/cloud/deploy/bootstrap-salt.sh

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#======================================================================================================================
2727
set -o nounset # Treat unset variables as an error
2828

29-
__ScriptVersion="2026.05.01"
29+
__ScriptVersion="2026.05.20"
3030
__ScriptName="bootstrap-salt.sh"
3131

3232
__ScriptFullName="$0"
@@ -2785,8 +2785,18 @@ __install_salt_from_repo() {
27852785

27862786
rm -f ${_TMP_DIR}/git/deps/*
27872787

2788-
echodebug "Installing Salt requirements from PyPi, ${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed ${_PIP_INSTALL_ARGS} -r requirements/static/ci/py${_py_version}/linux.txt"
2789-
${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed ${_PIP_INSTALL_ARGS} -r "requirements/static/ci/py${_py_version}/linux.txt"
2788+
_salt_static_ci_linux_req=""
2789+
if [ -f "requirements/static/ci/py${_py_version}/linux.lock" ]; then
2790+
_salt_static_ci_linux_req="requirements/static/ci/py${_py_version}/linux.lock"
2791+
elif [ -f "requirements/static/ci/py${_py_version}/linux.txt" ]; then
2792+
_salt_static_ci_linux_req="requirements/static/ci/py${_py_version}/linux.txt"
2793+
else
2794+
echoerror "Salt static CI requirements not found: expected requirements/static/ci/py${_py_version}/linux.lock or requirements/static/ci/py${_py_version}/linux.txt"
2795+
return 1
2796+
fi
2797+
2798+
echodebug "Installing Salt requirements from PyPi, ${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed ${_PIP_INSTALL_ARGS} -r ${_salt_static_ci_linux_req}"
2799+
${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed ${_PIP_INSTALL_ARGS} -r "${_salt_static_ci_linux_req}"
27902800
# shellcheck disable=SC2181
27912801
if [ $? -ne 0 ]; then
27922802
echo "Failed to install salt requirements for the version of Python ${_py_version}"

0 commit comments

Comments
 (0)