mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-16 09:40:21 +00:00
Update minimum versions and correct Redat 7 base key
This commit is contained in:
David Murphy
Daniel Wozniak
parent
9fee6196f6
commit
15bea28fa9
3 changed files with 59 additions and 38 deletions
28
.github/workflows/ci.yml
vendored
28
.github/workflows/ci.yml
vendored
|
|
@ -204,7 +204,7 @@ jobs:
|
|||
display-name: Windows 2019
|
||||
timeout: 20
|
||||
runs-on: windows-2019
|
||||
instances: '["stable-3005", "stable-3005-1", "stable-3006", "stable-3006-1", "latest"]'
|
||||
instances: '["stable-3005", "stable-3005-5", "stable-3006", "stable-3006-1", "latest"]'
|
||||
|
||||
|
||||
windows-2022:
|
||||
|
|
@ -219,7 +219,7 @@ jobs:
|
|||
display-name: Windows 2022
|
||||
timeout: 20
|
||||
runs-on: windows-2022
|
||||
instances: '["stable-3005", "stable-3005-1", "stable-3006", "stable-3006-1", "latest"]'
|
||||
instances: '["stable-3005", "stable-3005-5", "stable-3006", "stable-3006-1", "latest"]'
|
||||
|
||||
|
||||
|
||||
|
|
@ -234,7 +234,7 @@ jobs:
|
|||
distro-slug: almalinux-8
|
||||
display-name: AlmaLinux 8
|
||||
timeout: 20
|
||||
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
|
||||
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
|
||||
|
||||
|
||||
almalinux-9:
|
||||
|
|
@ -262,7 +262,7 @@ jobs:
|
|||
distro-slug: amazon-2
|
||||
display-name: Amazon 2
|
||||
timeout: 20
|
||||
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
|
||||
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
|
||||
|
||||
|
||||
amazon-2023:
|
||||
|
|
@ -276,7 +276,7 @@ jobs:
|
|||
distro-slug: amazon-2023
|
||||
display-name: Amazon 2023
|
||||
timeout: 20
|
||||
instances: '["stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "git-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
|
||||
instances: '["stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "git-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
|
||||
|
||||
|
||||
arch:
|
||||
|
|
@ -304,7 +304,7 @@ jobs:
|
|||
distro-slug: centos-7
|
||||
display-name: CentOS 7
|
||||
timeout: 20
|
||||
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
|
||||
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
|
||||
|
||||
|
||||
centos-stream8:
|
||||
|
|
@ -318,7 +318,7 @@ jobs:
|
|||
distro-slug: centos-stream8
|
||||
display-name: CentOS Stream 8
|
||||
timeout: 20
|
||||
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
|
||||
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
|
||||
|
||||
|
||||
centos-stream9:
|
||||
|
|
@ -346,7 +346,7 @@ jobs:
|
|||
distro-slug: debian-10
|
||||
display-name: Debian 10
|
||||
timeout: 20
|
||||
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
|
||||
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
|
||||
|
||||
|
||||
debian-11:
|
||||
|
|
@ -360,7 +360,7 @@ jobs:
|
|||
distro-slug: debian-11
|
||||
display-name: Debian 11
|
||||
timeout: 20
|
||||
instances: '["old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
|
||||
instances: '["old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
|
||||
|
||||
|
||||
debian-12:
|
||||
|
|
@ -486,7 +486,7 @@ jobs:
|
|||
distro-slug: oraclelinux-7
|
||||
display-name: Oracle Linux 7
|
||||
timeout: 20
|
||||
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
|
||||
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
|
||||
|
||||
|
||||
oraclelinux-8:
|
||||
|
|
@ -500,7 +500,7 @@ jobs:
|
|||
distro-slug: oraclelinux-8
|
||||
display-name: Oracle Linux 8
|
||||
timeout: 20
|
||||
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
|
||||
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
|
||||
|
||||
|
||||
photon-3:
|
||||
|
|
@ -542,7 +542,7 @@ jobs:
|
|||
distro-slug: rockylinux-8
|
||||
display-name: Rocky Linux 8
|
||||
timeout: 20
|
||||
instances: '["old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
|
||||
instances: '["old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
|
||||
|
||||
|
||||
rockylinux-9:
|
||||
|
|
@ -570,7 +570,7 @@ jobs:
|
|||
distro-slug: ubuntu-2004
|
||||
display-name: Ubuntu 20.04
|
||||
timeout: 20
|
||||
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
|
||||
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
|
||||
|
||||
|
||||
ubuntu-2204:
|
||||
|
|
@ -584,7 +584,7 @@ jobs:
|
|||
distro-slug: ubuntu-2204
|
||||
display-name: Ubuntu 22.04
|
||||
timeout: 20
|
||||
instances: '["stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
|
||||
instances: '["stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
|
||||
|
||||
|
||||
set-pipeline-exit-status:
|
||||
|
|
|
|||
16
.github/workflows/templates/generate.py
vendored
16
.github/workflows/templates/generate.py
vendored
|
|
@ -317,7 +317,7 @@ SALT_VERSIONS = [
|
|||
"3003",
|
||||
"3004",
|
||||
"3005",
|
||||
"3005-1",
|
||||
"3005-5",
|
||||
"3006",
|
||||
"3006-1",
|
||||
"master",
|
||||
|
|
@ -337,7 +337,7 @@ VERSION_DISPLAY_NAMES = {
|
|||
"3003": "v3003",
|
||||
"3004": "v3004",
|
||||
"3005": "v3005",
|
||||
"3005-1": "v3005.1",
|
||||
"3005-5": "v3005.5",
|
||||
"3006": "v3006",
|
||||
"3006-1": "v3006.1",
|
||||
"3006-6": "v3006.6",
|
||||
|
|
@ -347,7 +347,7 @@ VERSION_DISPLAY_NAMES = {
|
|||
}
|
||||
|
||||
OLD_STABLE_VERSION_BLACKLIST = [
|
||||
"3005-1",
|
||||
"3005-5",
|
||||
"3006",
|
||||
"3006-1",
|
||||
"master",
|
||||
|
|
@ -362,7 +362,7 @@ STABLE_VERSION_BLACKLIST = [
|
|||
]
|
||||
|
||||
MAC_OLD_STABLE_VERSION_BLACKLIST = [
|
||||
"3005-1",
|
||||
"3005-5",
|
||||
"3006",
|
||||
"3006-1",
|
||||
"3006-6",
|
||||
|
|
@ -374,13 +374,13 @@ MAC_STABLE_VERSION_BLACKLIST = [
|
|||
"3003",
|
||||
"3004",
|
||||
"3005",
|
||||
"3005-1",
|
||||
"3005-5",
|
||||
"master",
|
||||
"nightly",
|
||||
]
|
||||
|
||||
GIT_VERSION_BLACKLIST = [
|
||||
"3005-1",
|
||||
"3005-5",
|
||||
"3006-1",
|
||||
"nightly",
|
||||
]
|
||||
|
|
@ -712,7 +712,7 @@ def generate_test_jobs():
|
|||
"3003": BLACKLIST_3003,
|
||||
"3004": BLACKLIST_3004,
|
||||
"3005": BLACKLIST_3005,
|
||||
"3005-1": BLACKLIST_3005,
|
||||
"3005-5": BLACKLIST_3005,
|
||||
"3006": BLACKLIST_3006,
|
||||
"3006-1": BLACKLIST_3006,
|
||||
}
|
||||
|
|
@ -733,7 +733,7 @@ def generate_test_jobs():
|
|||
|
||||
if (
|
||||
salt_version
|
||||
in ("3003", "3004", "3005", "3005-1", "3006", "3006-1", "master")
|
||||
in ("3003", "3004", "3005", "3005-5", "3006", "3006-1", "master")
|
||||
and distro in BLACKLIST[salt_version]
|
||||
):
|
||||
continue
|
||||
|
|
|
|||
|
|
@ -1456,17 +1456,24 @@ __gather_system_info() {
|
|||
__ubuntu_derivatives_translation() {
|
||||
UBUNTU_DERIVATIVES="(trisquel|linuxmint|linaro|elementary_os|neon|pop)"
|
||||
# Mappings
|
||||
trisquel_6_ubuntu_base="12.04"
|
||||
linuxmint_13_ubuntu_base="12.04"
|
||||
linuxmint_17_ubuntu_base="14.04"
|
||||
linuxmint_18_ubuntu_base="16.04"
|
||||
linuxmint_19_ubuntu_base="18.04"
|
||||
## DGM trisquel_6_ubuntu_base="12.04"
|
||||
## DGM linuxmint_13_ubuntu_base="12.04"
|
||||
## DGM linuxmint_17_ubuntu_base="14.04"
|
||||
## DGM linuxmint_18_ubuntu_base="16.04"
|
||||
## DGM linuxmint_19_ubuntu_base="18.04"
|
||||
linuxmint_20_ubuntu_base="20.04"
|
||||
<<<<<<< HEAD
|
||||
linuxmint_21_ubuntu_base="22.04"
|
||||
linaro_12_ubuntu_base="12.04"
|
||||
elementary_os_02_ubuntu_base="12.04"
|
||||
neon_16_ubuntu_base="16.04"
|
||||
neon_18_ubuntu_base="18.04"
|
||||
=======
|
||||
## DGM linaro_12_ubuntu_base="12.04"
|
||||
## DGM elementary_os_02_ubuntu_base="12.04"
|
||||
## DGM neon_16_ubuntu_base="16.04"
|
||||
## DGM neon_18_ubuntu_base="18.04"
|
||||
>>>>>>> ddbec60 (Update minimum versions and correct Redat 7 base key)
|
||||
neon_20_ubuntu_base="20.04"
|
||||
neon_22_ubuntu_base="22.04"
|
||||
pop_22_ubuntu_base="22.04"
|
||||
|
|
@ -1740,7 +1747,8 @@ __check_end_of_life_versions() {
|
|||
case "${DISTRO_NAME_L}" in
|
||||
debian)
|
||||
# Debian versions below 9 are not supported
|
||||
if [ "$DISTRO_MAJOR_VERSION" -lt 9 ]; then
|
||||
## DGM if [ "$DISTRO_MAJOR_VERSION" -lt 9 ]; then
|
||||
if [ "$DISTRO_MAJOR_VERSION" -lt 10 ]; then
|
||||
echoerror "End of life distributions are not supported."
|
||||
echoerror "Please consider upgrading to the next stable. See:"
|
||||
echoerror " https://wiki.debian.org/DebianReleases"
|
||||
|
|
@ -1757,12 +1765,24 @@ __check_end_of_life_versions() {
|
|||
# = 18.10
|
||||
# = 19.04, 19.10
|
||||
# = 20.10
|
||||
if [ "$DISTRO_MAJOR_VERSION" -lt 16 ] || \
|
||||
[ "$DISTRO_MAJOR_VERSION" -eq 17 ] || \
|
||||
[ "$DISTRO_MAJOR_VERSION" -eq 19 ] || \
|
||||
{ [ "$DISTRO_MAJOR_VERSION" -eq 16 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; } || \
|
||||
{ [ "$DISTRO_MAJOR_VERSION" -eq 18 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; } || \
|
||||
{ [ "$DISTRO_MAJOR_VERSION" -eq 20 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; }; then
|
||||
## if [ "$DISTRO_MAJOR_VERSION" -lt 16 ] || \
|
||||
## [ "$DISTRO_MAJOR_VERSION" -eq 17 ] || \
|
||||
## [ "$DISTRO_MAJOR_VERSION" -eq 19 ] || \
|
||||
## { [ "$DISTRO_MAJOR_VERSION" -eq 16 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; } || \
|
||||
## { [ "$DISTRO_MAJOR_VERSION" -eq 18 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; } || \
|
||||
## { [ "$DISTRO_MAJOR_VERSION" -eq 20 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; }; then
|
||||
## echoerror "End of life distributions are not supported."
|
||||
## echoerror "Please consider upgrading to the next stable. See:"
|
||||
## echoerror " https://wiki.ubuntu.com/Releases"
|
||||
## exit 1
|
||||
## fi
|
||||
if [ "$DISTRO_MAJOR_VERSION" -lt 20 ] || \
|
||||
{ [ "$DISTRO_MAJOR_VERSION" -eq 20 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; } || \
|
||||
{ [ "$DISTRO_MAJOR_VERSION" -eq 21 ] && [ "$DISTRO_MINOR_VERSION" -eq 04 ]; } || \
|
||||
{ [ "$DISTRO_MAJOR_VERSION" -eq 21 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; } || \
|
||||
{ [ "$DISTRO_MAJOR_VERSION" -eq 22 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; } || \
|
||||
{ [ "$DISTRO_MAJOR_VERSION" -eq 23 ] && [ "$DISTRO_MINOR_VERSION" -eq 04 ]; } || \
|
||||
{ [ "$DISTRO_MAJOR_VERSION" -eq 23 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; }; then
|
||||
echoerror "End of life distributions are not supported."
|
||||
echoerror "Please consider upgrading to the next stable. See:"
|
||||
echoerror " https://wiki.ubuntu.com/Releases"
|
||||
|
|
@ -1807,7 +1827,8 @@ __check_end_of_life_versions() {
|
|||
|
||||
fedora)
|
||||
# Fedora lower than 33 are no longer supported
|
||||
if [ "$DISTRO_MAJOR_VERSION" -lt 33 ]; then
|
||||
## DGM if [ "$DISTRO_MAJOR_VERSION" -lt 33 ]; then
|
||||
if [ "$DISTRO_MAJOR_VERSION" -lt 37 ]; then
|
||||
echoerror "End of life distributions are not supported."
|
||||
echoerror "Please consider upgrading to the next stable. See:"
|
||||
echoerror " https://fedoraproject.org/wiki/Releases"
|
||||
|
|
@ -4638,7 +4659,7 @@ __install_saltstack_rhel_repository() {
|
|||
# Instead, this should work correctly on all RHEL variants.
|
||||
base_url="${HTTP_VAL}://${_REPO_URL}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/\$basearch/${repo_rev}/"
|
||||
if [ "${DISTRO_MAJOR_VERSION}" -eq 7 ]; then
|
||||
gpg_key="SALTSTACK-GPG-KEY.pub base/RPM-GPG-KEY-CentOS-7"
|
||||
gpg_key="SALTSTACK-GPG-KEY.pub base/RPM-GPG-KEY-CentOS-7.key"
|
||||
elif [ "${DISTRO_MAJOR_VERSION}" -ge 9 ]; then
|
||||
gpg_key="SALTSTACK-GPG-KEY2.pub"
|
||||
else
|
||||
|
|
@ -6487,7 +6508,7 @@ install_amazon_linux_ami_2_deps() {
|
|||
fi
|
||||
|
||||
base_url="$HTTP_VAL://${_REPO_URL}/${__PY_VERSION_REPO}/amazon/2/\$basearch/$repo_rev/"
|
||||
gpg_key="${base_url}SALTSTACK-GPG-KEY.pub,${base_url}base/RPM-GPG-KEY-CentOS-7"
|
||||
gpg_key="${base_url}SALTSTACK-GPG-KEY.pub,${base_url}base/RPM-GPG-KEY-CentOS-7.key"
|
||||
if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
|
||||
gpg_key="${base_url}SALTSTACK-GPG-KEY.pub"
|
||||
fi
|
||||
|
|
@ -6575,7 +6596,7 @@ install_amazon_linux_ami_2_onedir_deps() {
|
|||
fi
|
||||
|
||||
if [ "$(echo "${ONEDIR_REV}" | grep -E '(3004|3005)')" != "" ] || [ "${ONEDIR_REV}" = "nightly" ]; then
|
||||
gpg_key="${base_url}SALTSTACK-GPG-KEY.pub,${base_url}base/RPM-GPG-KEY-CentOS-7"
|
||||
gpg_key="${base_url}SALTSTACK-GPG-KEY.pub,${base_url}base/RPM-GPG-KEY-CentOS-7.key"
|
||||
if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
|
||||
gpg_key="${base_url}SALTSTACK-GPG-KEY.pub"
|
||||
fi
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue