Skip to content
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

Testing git install methods #2057

Merged
merged 6 commits into from
Nov 27, 2024
Merged

Testing git install methods #2057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b96a669
Testin ggit install methods
dmurphy18 Nov 26, 2024
a79cd05
Updated to install jaraco.functools v4.0.0 for splat on Linux
dmurphy18 Nov 26, 2024
e4b3164
Updated containers, and added back in AlmaLinux
dmurphy18 Nov 26, 2024
9b3055b
Testing fixes for PyPI requirements clashes
dmurphy18 Nov 26, 2024
d0bd461
Testing pip installs from PyPI
dmurphy18 Nov 27, 2024
3c0f302
Added support for AlmaLinux, removed Rocky Linux 9 from git testing
dmurphy18 Nov 27, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ jobs:
display-name: Debian 12
container-slug: systemd-debian-12
timeout: 20
instances: '["stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
instances: '["stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'


photon-5:
Expand All @@ -207,7 +207,7 @@ jobs:
display-name: Photon OS 5
container-slug: systemd-photon-5
timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "latest", "default"]'
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'


rockylinux-8:
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/templates/generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
# "amazonlinux-2",
# "amazonlinux-2023",
# "debian-11",
# "debian-12",
# "debian-13",
# "fedora-40",
# "photon-4",
Expand Down Expand Up @@ -92,9 +91,9 @@
"ubuntu-2404",
]

# "photon-5",
BLACKLIST_3007 = [
"photon-4",
"photon-5",
]

# "ubuntu-2204",
Expand All @@ -111,12 +110,12 @@
"ubuntu-2404",
]

# "debian-12",
# "ubuntu-2204",
BLACKLIST_GIT_3007 = [
"amazonlinux-2",
"amazonlinux-2023",
"debian-11",
"debian-12",
"debian-13",
"fedora-40",
"photon-4",
Expand All @@ -126,11 +125,11 @@
"ubuntu-2404",
]

# "debian-12",
BLACKLIST_GIT_MASTER = [
"amazonlinux-2",
"amazonlinux-2023",
"debian-11",
"debian-12",
"debian-13",
"fedora-40",
"photon-4",
Expand Down
108 changes: 41 additions & 67 deletions 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="2024.11.26"
__ScriptVersion="2024.11.27"
__ScriptName="bootstrap-salt.sh"

__ScriptFullName="$0"
Expand Down Expand Up @@ -2742,44 +2742,6 @@ __install_salt_from_repo() {

echodebug "Installed pip version: $(${_pip_cmd} --version)"

CHECK_PIP_VERSION_SCRIPT=$(cat << EOM
import sys
try:
import pip
installed_pip_version=tuple([int(part.strip()) for part in pip.__version__.split('.') if part.isdigit()])
desired_pip_version=($(echo ${_MINIMUM_PIP_VERSION} | sed 's/\./, /g' ))
if installed_pip_version < desired_pip_version:
print('Desired pip version {!r} > Installed pip version {!r}'.format('.'.join(map(str, desired_pip_version)), '.'.join(map(str, installed_pip_version))))
sys.exit(1)
print('Desired pip version {!r} < Installed pip version {!r}'.format('.'.join(map(str, desired_pip_version)), '.'.join(map(str, installed_pip_version))))
sys.exit(0)
except ImportError:
print('Failed to import pip')
sys.exit(1)
EOM
)
if ! ${_py_exe} -c "$CHECK_PIP_VERSION_SCRIPT"; then
# Upgrade pip to at least 1.2 which is when we can start using "python3 -m pip"
echodebug "Running '${_pip_cmd} install ${_PIP_INSTALL_ARGS} pip>=${_MINIMUM_PIP_VERSION}'"
${_pip_cmd} install ${_PIP_INSTALL_ARGS} -v "pip>=${_MINIMUM_PIP_VERSION}"
sleep 1
echodebug "PATH: ${PATH}"
_pip_cmd="pip${_py_version}"
if ! __check_command_exists "${_pip_cmd}"; then
echodebug "The pip binary '${_pip_cmd}' was not found in PATH"
_pip_cmd="pip$(echo "${_py_version}" | cut -c -1)"
if ! __check_command_exists "${_pip_cmd}"; then
echodebug "The pip binary '${_pip_cmd}' was not found in PATH"
_pip_cmd="pip"
if ! __check_command_exists "${_pip_cmd}"; then
echoerror "Unable to find a pip binary"
return 1
fi
fi
fi
echodebug "Installed pip version: $(${_pip_cmd} --version)"
fi

_setuptools_dep="setuptools>=${_MINIMUM_SETUPTOOLS_VERSION},<${_MAXIMUM_SETUPTOOLS_VERSION}"
if [ "$_PY_MAJOR_VERSION" -ne 3 ]; then
echoerror "Python version is no longer supported, only Python 3"
Expand All @@ -2802,7 +2764,6 @@ EOM

mkdir -p /tmp/git/deps
echodebug "Created directory /tmp/git/deps"
echodebug "Installing Salt dependencies for Salt version $(python3 salt/version.py)"

if [ ${DISTRO_NAME_L} = "ubuntu" ] && [ "$DISTRO_MAJOR_VERSION" -eq 22 ]; then
echodebug "Ubuntu 22.04 has problem with base.txt requirements file, not parsing sys_platform == 'win32', upgrading from default pip works"
Expand All @@ -2815,20 +2776,23 @@ EOM
fi
fi

echoinfo "Downloading Salt Dependencies from PyPi"
echodebug "Running '${_pip_cmd} download -d /tmp/git/deps ${_PIP_DOWNLOAD_ARGS} .'"
${_pip_cmd} download -d /tmp/git/deps ${_PIP_DOWNLOAD_ARGS} .
rm -f /tmp/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"
# shellcheck disable=SC2181
if [ $? -ne 0 ]; then
echo "Failed to download salt dependencies"
echo "Failed to install salt requirements for the version of Python ${_py_version}"
return 1
fi


echoinfo "Installing Downloaded Salt Dependencies"
echodebug "Running '${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed ${_PIP_INSTALL_ARGS} /tmp/git/deps/*'"
${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed ${_PIP_INSTALL_ARGS} /tmp/git/deps/* || return 1
rm -f /tmp/git/deps/*
if [ "${OS_NAME}" = "Linux" ]; then
${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed --upgrade ${_PIP_INSTALL_ARGS} "jaraco.functools==4.1.0" || return 1
${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed --upgrade ${_PIP_INSTALL_ARGS} "jaraco.text==4.0.0" || return 1
${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed --upgrade ${_PIP_INSTALL_ARGS} "jaraco.collections==5.1.0" || return 1
${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed --upgrade ${_PIP_INSTALL_ARGS} "jaraco.context==6.0.1" || return 1
${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed --upgrade ${_PIP_INSTALL_ARGS} "jaraco.classes==3.4.0" || return 1
fi

echoinfo "Building Salt Python Wheel"
if [ "$_ECHO_DEBUG" -eq $BS_TRUE ]; then
Expand Down Expand Up @@ -5139,79 +5103,79 @@ install_oracle_linux_check_services() {

#######################################################################################################################
#
# RockyLinux Install Functions
# ALmaLinux Install Functions
#
install_rockylinux_stable_deps() {
install_almalinux_stable_deps() {
install_centos_stable_deps || return 1
return 0
}

install_rockylinux_git_deps() {
install_almalinux_git_deps() {
install_centos_git_deps || return 1
return 0
}

install_rockylinux_onedir_deps() {
install_almalinux_onedir_deps() {
install_centos_onedir_deps || return 1
return 0
}

install_rockylinux_testing_deps() {
install_almalinux_testing_deps() {
install_centos_testing_deps || return 1
return 0
}

install_rockylinux_stable() {
install_almalinux_stable() {
install_centos_stable || return 1
return 0
}

install_rockylinux_git() {
install_almalinux_git() {
install_centos_git || return 1
return 0
}

install_rockylinux_onedir() {
install_almalinux_onedir() {
install_centos_onedir || return 1
return 0
}

install_rockylinux_testing() {
install_almalinux_testing() {
install_centos_testing || return 1
return 0
}

install_rockylinux_stable_post() {
install_almalinux_stable_post() {
install_centos_stable_post || return 1
return 0
}

install_rockylinux_git_post() {
install_almalinux_git_post() {
install_centos_git_post || return 1
return 0
}

install_rockylinux_onedir_post() {
install_almalinux_onedir_post() {
install_centos_onedir_post || return 1
return 0
}

install_rockylinux_testing_post() {
install_almalinux_testing_post() {
install_centos_testing_post || return 1
return 0
}

install_rockylinux_restart_daemons() {
install_almalinux_restart_daemons() {
install_centos_restart_daemons || return 1
return 0
}

install_rockylinux_check_services() {
install_almalinux_check_services() {
install_centos_check_services || return 1
return 0
}
#
# Ended RockyLinux Install Functions
# Ended AlmaLinux Install Functions
#
#######################################################################################################################

Expand Down Expand Up @@ -6373,7 +6337,7 @@ install_photon_deps() {
__PACKAGES="${__PACKAGES} libyaml procps-ng python${PY_PKG_VER}-crypto python${PY_PKG_VER}-jinja2"
__PACKAGES="${__PACKAGES} python${PY_PKG_VER}-msgpack python${PY_PKG_VER}-requests python${PY_PKG_VER}-zmq"
__PACKAGES="${__PACKAGES} python${PY_PKG_VER}-pip python${PY_PKG_VER}-m2crypto python${PY_PKG_VER}-pyyaml"
__PACKAGES="${__PACKAGES} python${PY_PKG_VER}-systemd"
__PACKAGES="${__PACKAGES} python${PY_PKG_VER}-systemd sudo shadow"

if [ "${_EXTRA_PACKAGES}" != "" ]; then
echoinfo "Installing the following extra packages as requested: ${_EXTRA_PACKAGES}"
Expand Down Expand Up @@ -6423,6 +6387,14 @@ install_photon_git_deps() {
__PACKAGES="${__PACKAGES} git"
fi

if ! __check_command_exists sudo; then
__PACKAGES="${__PACKAGES} sudo"
fi

if ! __check_command_exists usermod; then
__PACKAGES="${__PACKAGES} shadow"
fi

if [ -n "${__PACKAGES}" ]; then
# shellcheck disable=SC2086
__tdnf_install_noinput ${__PACKAGES} || return 1
Expand Down Expand Up @@ -6471,6 +6443,8 @@ install_photon_git() {
return 1
fi

install_photon_git_deps

if [ -f "${_SALT_GIT_CHECKOUT_DIR}/salt/syspaths.py" ]; then
${_PYEXE} setup.py --salt-config-dir="$_SALT_ETC_DIR" --salt-cache-dir="${_SALT_CACHE_DIR}" ${SETUP_PY_INSTALL_ARGS} install --prefix=/usr || return 1
else
Expand Down Expand Up @@ -6579,7 +6553,7 @@ install_photon_onedir_deps() {
__install_saltstack_photon_onedir_repository || return 1
fi

__PACKAGES="procps-ng"
__PACKAGES="procps-ng sudo shadow"

# shellcheck disable=SC2086
__tdnf_install_noinput ${__PACKAGES} || return 1
Expand Down
Loading