From e4b316413634295557f769ea7178b920b6be7da1 Mon Sep 17 00:00:00 2001 From: David Murphy Date: Tue, 26 Nov 2024 11:40:09 -0700 Subject: [PATCH] Updated containers, and added back in AlmaLinux --- .github/workflows/ci.yml | 48 ------------------------- .github/workflows/templates/generate.py | 18 +++++----- bootstrap-salt.sh | 32 ++++++++--------- 3 files changed, 25 insertions(+), 73 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d7fc1acf7..3af9085ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index cab372d80..68ee54ee5 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -8,15 +8,15 @@ # 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 @@ # 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 @@ # 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", diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index f094907b9..4e39521f6 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -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 # #######################################################################################################################