Skip to content

Update bootstrap script to support Salt 3008 requirements files #69196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dwoz merged 1 commit into from
May 21, 2026
+13 −3
Merged

Update bootstrap script to support Salt 3008 requirements files #69196

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions salt/cloud/deploy/bootstrap-salt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#======================================================================================================================
set -o nounset # Treat unset variables as an error

__ScriptVersion="2026.05.01"
__ScriptVersion="2026.05.20"
__ScriptName="bootstrap-salt.sh"

__ScriptFullName="$0"
Expand Down Expand Up @@ -2785,8 +2785,18 @@ __install_salt_from_repo() {

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

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"
${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed ${_PIP_INSTALL_ARGS} -r "requirements/static/ci/py${_py_version}/linux.txt"
_salt_static_ci_linux_req=""
if [ -f "requirements/static/ci/py${_py_version}/linux.lock" ]; then
_salt_static_ci_linux_req="requirements/static/ci/py${_py_version}/linux.lock"
elif [ -f "requirements/static/ci/py${_py_version}/linux.txt" ]; then
_salt_static_ci_linux_req="requirements/static/ci/py${_py_version}/linux.txt"
else
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"
return 1
fi

echodebug "Installing Salt requirements from PyPi, ${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed ${_PIP_INSTALL_ARGS} -r ${_salt_static_ci_linux_req}"
${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed ${_PIP_INSTALL_ARGS} -r "${_salt_static_ci_linux_req}"
# shellcheck disable=SC2181
if [ $? -ne 0 ]; then
echo "Failed to install salt requirements for the version of Python ${_py_version}"
Expand Down
Loading