From 86d1bb96629fbfcdc3f26af1e5f82dbe4c7e660b Mon Sep 17 00:00:00 2001 From: David Murphy Date: Mon, 25 Nov 2024 12:15:39 -0700 Subject: [PATCH] Added missing procps for Debian / Ubuntu container, and reduced containers used --- .github/workflows/ci.yml | 48 ------------------------- .github/workflows/templates/generate.py | 18 +++++----- bootstrap-salt.sh | 16 +++++++-- 3 files changed, 22 insertions(+), 60 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2464d77..a94508b 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", "git-master", "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 bf88486..097bb94 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -18,9 +18,6 @@ os.chdir(os.path.abspath(os.path.dirname(__file__))) # "ubuntu-2004", # "ubuntu-2404", LINUX_DISTROS = [ - "amazonlinux-2", - "amazonlinux-2023", - "debian-11", "debian-12", "photon-5", "rockylinux-8", @@ -40,15 +37,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", @@ -58,15 +55,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", @@ -133,6 +130,9 @@ BLACKLIST_GIT_3007 = [ BLACKLIST_GIT_MASTER = [ "amazonlinux-2", "amazonlinux-2023", + "debian-11", + "debian-13", + "fedora-40", "photon-4", "photon-5", ] diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 103ea07..52a93ff 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -26,7 +26,7 @@ #====================================================================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="2024.11.21" +__ScriptVersion="2024.11.25" __ScriptName="bootstrap-salt.sh" __ScriptFullName="$0" @@ -640,7 +640,11 @@ elif [ "$ITYPE" = "git" ]; then if [ "$#" -eq 0 ];then GIT_REV="master" else - GIT_REV="$1" + if [ "$(echo "$1" | grep -E '^(3006|3007)$')" != "" ]; then + GIT_REV="$1.x" # branches are 3006.x or 3007.x + else + GIT_REV="$1" + fi shift fi @@ -3085,7 +3089,7 @@ install_ubuntu_deps() { # Additionally install procps and pciutils which allows for Docker bootstraps. See 366#issuecomment-39666813 __PACKAGES="${__PACKAGES} procps pciutils" - # ensure sudo installed + # ensure sudo, ps installed __PACKAGES="${__PACKAGES} sudo" ## include hwclock if not part of base OS (23.10 and up) @@ -3171,6 +3175,9 @@ install_ubuntu_git_deps() { __PACKAGES="${__PACKAGES} util-linux-extra" fi + # Additionally install procps and pciutils which allows for Docker bootstraps. See 366#issuecomment-39666813 + __PACKAGES="${__PACKAGES} procps pciutils" + # ensure sudo installed __PACKAGES="${__PACKAGES} sudo" @@ -3618,6 +3625,9 @@ install_debian_git_deps() { __PACKAGES="python${PY_PKG_VER}-dev python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools gcc" echodebug "install_debian_git_deps() Installing ${__PACKAGES}" + # Additionally install procps and pciutils which allows for Docker bootstraps. See 366#issuecomment-39666813 + __PACKAGES="${__PACKAGES} procps pciutils" + # ensure sudo installed __PACKAGES="${__PACKAGES} sudo"