Skip to content

Commit 3c0f302

Browse files
dmurphy18dmurphy18
committed
Added support for AlmaLinux, removed Rocky Linux 9 from git testing
1 parent d0bd461 commit 3c0f302

File tree

3 files changed

+7
-80
lines changed

3 files changed

+7
-80
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ jobs:
207207
display-name: Photon OS 5
208208
container-slug: systemd-photon-5
209209
timeout: 20
210-
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "latest", "default"]'
210+
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
211211

212212

213213
rockylinux-8:
@@ -237,7 +237,7 @@ jobs:
237237
display-name: Rocky Linux 9
238238
container-slug: systemd-rockylinux-9
239239
timeout: 20
240-
instances: '["stable-3006", "git-3006", "onedir-3006", "stable-3006-8", "stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
240+
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
241241

242242

243243
ubuntu-2204:

‎.github/workflows/templates/generate.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,11 @@
9191
"ubuntu-2404",
9292
]
9393

94+
# "photon-5",
9495
BLACKLIST_3007 = [
9596
"photon-4",
96-
"photon-5",
9797
]
9898

99-
# "rockylinux-9",
10099
# "ubuntu-2204",
101100
BLACKLIST_GIT_3006 = [
102101
"amazonlinux-2",
@@ -106,12 +105,12 @@
106105
"fedora-40",
107106
"photon-4",
108107
"photon-5",
108+
"rockylinux-9",
109109
"ubuntu-2004",
110110
"ubuntu-2404",
111111
]
112112

113113
# "debian-12",
114-
# "rockylinux-9",
115114
# "ubuntu-2204",
116115
BLACKLIST_GIT_3007 = [
117116
"amazonlinux-2",
@@ -121,12 +120,12 @@
121120
"fedora-40",
122121
"photon-4",
123122
"photon-5",
123+
"rockylinux-9",
124124
"ubuntu-2004",
125125
"ubuntu-2404",
126126
]
127127

128128
# "debian-12",
129-
# "rockylinux-9",
130129
BLACKLIST_GIT_MASTER = [
131130
"amazonlinux-2",
132131
"amazonlinux-2023",
@@ -135,6 +134,7 @@
135134
"fedora-40",
136135
"photon-4",
137136
"photon-5",
137+
"rockylinux-9",
138138
]
139139

140140
SALT_VERSIONS = [

‎bootstrap-salt.sh‎

Lines changed: 1 addition & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -2742,44 +2742,6 @@ __install_salt_from_repo() {
27422742

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

2745-
## DGM CHECK_PIP_VERSION_SCRIPT=$(cat << EOM
2746-
## DGM import sys
2747-
## DGM try:
2748-
## DGM import pip
2749-
## DGM installed_pip_version=tuple([int(part.strip()) for part in pip.__version__.split('.') if part.isdigit()])
2750-
## DGM desired_pip_version=($(echo ${_MINIMUM_PIP_VERSION} | sed 's/\./, /g' ))
2751-
## DGM if installed_pip_version < desired_pip_version:
2752-
## DGM print('Desired pip version {!r} > Installed pip version {!r}'.format('.'.join(map(str, desired_pip_version)), '.'.join(map(str, installed_pip_version))))
2753-
## DGM sys.exit(1)
2754-
## DGM print('Desired pip version {!r} < Installed pip version {!r}'.format('.'.join(map(str, desired_pip_version)), '.'.join(map(str, installed_pip_version))))
2755-
## DGM sys.exit(0)
2756-
## DGM except ImportError:
2757-
## DGM print('Failed to import pip')
2758-
## DGM sys.exit(1)
2759-
## DGM EOM
2760-
## DGM )
2761-
## DGM if ! ${_py_exe} -c "$CHECK_PIP_VERSION_SCRIPT"; then
2762-
## DGM # Upgrade pip to at least 1.2 which is when we can start using "python3 -m pip"
2763-
## DGM echodebug "Running '${_pip_cmd} install ${_PIP_INSTALL_ARGS} pip>=${_MINIMUM_PIP_VERSION}'"
2764-
## DGM ${_pip_cmd} install ${_PIP_INSTALL_ARGS} -v "pip>=${_MINIMUM_PIP_VERSION}"
2765-
## DGM sleep 1
2766-
## DGM echodebug "PATH: ${PATH}"
2767-
## DGM _pip_cmd="pip${_py_version}"
2768-
## DGM if ! __check_command_exists "${_pip_cmd}"; then
2769-
## DGM echodebug "The pip binary '${_pip_cmd}' was not found in PATH"
2770-
## DGM _pip_cmd="pip$(echo "${_py_version}" | cut -c -1)"
2771-
## DGM if ! __check_command_exists "${_pip_cmd}"; then
2772-
## DGM echodebug "The pip binary '${_pip_cmd}' was not found in PATH"
2773-
## DGM _pip_cmd="pip"
2774-
## DGM if ! __check_command_exists "${_pip_cmd}"; then
2775-
## DGM echoerror "Unable to find a pip binary"
2776-
## DGM return 1
2777-
## DGM fi
2778-
## DGM fi
2779-
## DGM fi
2780-
## DGM echodebug "Installed pip version: $(${_pip_cmd} --version)"
2781-
## DGM fi
2782-
27832745
_setuptools_dep="setuptools>=${_MINIMUM_SETUPTOOLS_VERSION},<${_MAXIMUM_SETUPTOOLS_VERSION}"
27842746
if [ "$_PY_MAJOR_VERSION" -ne 3 ]; then
27852747
echoerror "Python version is no longer supported, only Python 3"
@@ -2797,15 +2759,11 @@ __install_salt_from_repo() {
27972759
echodebug "Running '${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --upgrade ${_PIP_INSTALL_ARGS} wheel ${_setuptools_dep}"
27982760
${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --upgrade ${_PIP_INSTALL_ARGS} wheel "${_setuptools_dep}"
27992761

2800-
echodebug "DGM doing pip list"
2801-
${_pip_cmd} list
2802-
28032762
echoinfo "Installing salt using ${_py_exe}, $(${_py_exe} --version)"
28042763
cd "${_SALT_GIT_CHECKOUT_DIR}" || return 1
28052764

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

28102768
if [ ${DISTRO_NAME_L} = "ubuntu" ] && [ "$DISTRO_MAJOR_VERSION" -eq 22 ]; then
28112769
echodebug "Ubuntu 22.04 has problem with base.txt requirements file, not parsing sys_platform == 'win32', upgrading from default pip works"
@@ -2818,37 +2776,9 @@ __install_salt_from_repo() {
28182776
fi
28192777
fi
28202778

2821-
## DGM echoinfo "Downloading Salt Dependencies from PyPi"
2822-
## DGM if [ "${OS_NAME}" = "Linux" ]; then
2823-
## DGM echodebug "Solving jaraco.functools splat issue, installing jaraco.functools v4.0.0"
2824-
## DGM ${_pip_cmd} install "jaraco.functools==4.0.0" || return 1
2825-
## DGM echodebug "Running '${_pip_cmd} download -d /tmp/git/deps ${_PIP_DOWNLOAD_ARGS} -r requirements/static/ci/py${_py_version}/linux.txt"
2826-
## DGM ${_pip_cmd} download -d /tmp/git/deps ${_PIP_DOWNLOAD_ARGS} -r "requirements/static/ci/py${_py_version}/linux.txt"
2827-
## DGM else
2828-
## DGM echodebug "Running '${_pip_cmd} download -d /tmp/git/deps ${_PIP_DOWNLOAD_ARGS} .'"
2829-
## DGM ${_pip_cmd} download -d /tmp/git/deps ${_PIP_DOWNLOAD_ARGS} .
2830-
## DGM fi
2831-
## DGM # shellcheck disable=SC2181
2832-
## DGM if [ $? -ne 0 ]; then
2833-
## DGM echo "Failed to download salt dependencies"
2834-
## DGM return 1
2835-
## DGM fi
2836-
2837-
2838-
## DGM echoinfo "Installing Downloaded Salt Dependencies"
2839-
## DGM echodebug "Running '${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed ${_PIP_INSTALL_ARGS} /tmp/git/deps/*'"
2840-
## DGM ${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed ${_PIP_INSTALL_ARGS} /tmp/git/deps/* || return 1
2841-
2842-
echodebug "DGM doing pip list"
2843-
${_pip_cmd} list
2844-
28452779
rm -f /tmp/git/deps/*
28462780

2847-
echodebug "DGM doing pip list"
2848-
${_pip_cmd} list
2849-
2850-
## DGM different attempt, try installing requirements
2851-
echoinfo "DGM 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"
2781+
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"
28522782
${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed ${_PIP_INSTALL_ARGS} -r "requirements/static/ci/py${_py_version}/linux.txt"
28532783
# shellcheck disable=SC2181
28542784
if [ $? -ne 0 ]; then
@@ -2862,9 +2792,6 @@ __install_salt_from_repo() {
28622792
${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed --upgrade ${_PIP_INSTALL_ARGS} "jaraco.collections==5.1.0" || return 1
28632793
${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed --upgrade ${_PIP_INSTALL_ARGS} "jaraco.context==6.0.1" || return 1
28642794
${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed --upgrade ${_PIP_INSTALL_ARGS} "jaraco.classes==3.4.0" || return 1
2865-
2866-
echodebug "DGM doing pip list"
2867-
${_pip_cmd} list
28682795
fi
28692796

28702797
echoinfo "Building Salt Python Wheel"

0 commit comments

Comments
 (0)