saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated containers, and added back in AlmaLinux

Browse source
This commit is contained in:
David Murphy 2024-11-26 11:40:09 -07:00
parent a79cd05fa0
commit e4b3164136
No known key found for this signature in database
GPG key ID: 9D7724F37A7424D8
3 changed files with 25 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
.github/workflows/ci.yml vendored
View file

@ -180,51 +180,6 @@ jobs:
amazonlinux-2:
name: Amazon 2
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
uses: ./.github/workflows/test-linux.yml
needs:
- lint
- generate-actions-workflow
with:
distro-slug: amazonlinux-2
display-name: Amazon 2
container-slug: systemd-amazonlinux-2
timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
amazonlinux-2023:
name: Amazon 2023
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
uses: ./.github/workflows/test-linux.yml
needs:
- lint
- generate-actions-workflow
with:
distro-slug: amazonlinux-2023
display-name: Amazon 2023
container-slug: systemd-amazonlinux-2023
timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
debian-11:
name: Debian 11
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
uses: ./.github/workflows/test-linux.yml
needs:
- lint
- generate-actions-workflow
with:
distro-slug: debian-11
display-name: Debian 11
container-slug: systemd-debian-11
timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
debian-12:
name: Debian 12
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@ -312,9 +267,6 @@ jobs:
- macos-13
- macos-14
- windows-2022
- amazonlinux-2
- amazonlinux-2023
- debian-11
- debian-12
- photon-5
- rockylinux-8

18
.github/workflows/templates/generate.py vendored
View file

@ -8,15 +8,15 @@ os.chdir(os.path.abspath(os.path.dirname(__file__)))
# only test against current containers with systemd
# will add these when they become available with systemd
# "amazonlinux-2",
# "amazonlinux-2023",
# "debian-11",
# "debian-13",
# "fedora-40",
# "photon-4",
# "ubuntu-2004",
# "ubuntu-2404",
LINUX_DISTROS = [
"amazonlinux-2",
"amazonlinux-2023",
"debian-11",
"debian-12",
"photon-5",
"rockylinux-8",
@ -36,15 +36,15 @@ OSX = [
# only test against current containers with systemd
# will add these when they become available with systemd
# "amazonlinux-2",
# "amazonlinux-2023",
# "debian-11",
# "debian-13",
# "fedora-40",
# "photon-4",
# "ubuntu-2004",
# "ubuntu-2404",
STABLE_DISTROS = [
"amazonlinux-2",
"amazonlinux-2023",
"debian-11",
"debian-12",
"photon-5",
"rockylinux-8",
@ -54,15 +54,15 @@ STABLE_DISTROS = [
# only test against current containers with systemd
# will add these when they become available with systemd
# "amazonlinux-2",
# "amazonlinux-2023",
# "debian-11",
# "debian-13",
# "fedora-40",
# "photon-4",
# "ubuntu-2004",
# "ubuntu-2404",
ONEDIR_DISTROS = [
"amazonlinux-2",
"amazonlinux-2023",
"debian-11",
"debian-12",
"photon-5",
"rockylinux-8",

32
bootstrap-salt.sh
View file

@ -5146,79 +5146,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
#
#######################################################################################################################