From a79cd05fa070f32d23e397d291beb18592ff6741 Mon Sep 17 00:00:00 2001 From: David Murphy Date: Tue, 26 Nov 2024 10:45:49 -0700 Subject: [PATCH] Updated to install jaraco.functools v4.0.0 for splat on Linux --- .github/workflows/ci.yml | 52 ++++++++++++++++++++++++- .github/workflows/templates/generate.py | 29 +++++++------- bootstrap-salt.sh | 2 + 3 files changed, 66 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 980dc7e..d7fc1ac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -180,6 +180,51 @@ 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' @@ -192,7 +237,7 @@ jobs: display-name: Debian 12 container-slug: systemd-debian-12 timeout: 20 - instances: '["stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]' + instances: '["stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]' photon-5: @@ -237,7 +282,7 @@ jobs: display-name: Rocky Linux 9 container-slug: systemd-rockylinux-9 timeout: 20 - instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]' + instances: '["stable-3006", "git-3006", "onedir-3006", "stable-3006-8", "stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]' ubuntu-2204: @@ -267,6 +312,9 @@ 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 0207d98..cab372d 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -8,16 +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-12", # "debian-13", # "fedora-40", # "photon-4", # "ubuntu-2004", # "ubuntu-2404", LINUX_DISTROS = [ + "amazonlinux-2", + "amazonlinux-2023", + "debian-11", "debian-12", "photon-5", "rockylinux-8", @@ -37,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", @@ -55,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", @@ -97,6 +96,7 @@ BLACKLIST_3007 = [ "photon-5", ] +# "rockylinux-9", # "ubuntu-2204", BLACKLIST_GIT_3006 = [ "amazonlinux-2", @@ -106,36 +106,35 @@ BLACKLIST_GIT_3006 = [ "fedora-40", "photon-4", "photon-5", - "rockylinux-9", "ubuntu-2004", "ubuntu-2404", ] +# "debian-12", +# "rockylinux-9", # "ubuntu-2204", BLACKLIST_GIT_3007 = [ "amazonlinux-2", "amazonlinux-2023", "debian-11", - "debian-12", "debian-13", "fedora-40", "photon-4", "photon-5", - "rockylinux-9", "ubuntu-2004", "ubuntu-2404", ] +# "debian-12", +# "rockylinux-9", BLACKLIST_GIT_MASTER = [ "amazonlinux-2", "amazonlinux-2023", "debian-11", - "debian-12", "debian-13", "fedora-40", "photon-4", "photon-5", - "rockylinux-9", ] SALT_VERSIONS = [ diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index b41c256..f094907 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2817,6 +2817,8 @@ __install_salt_from_repo() { echoinfo "Downloading Salt Dependencies from PyPi" if [ "${OS_NAME}" = "Linux" ]; then + echodebug "Solving jaraco.functools splat issue, installing jaraco.functools v4.0.0" + ${_pip_cmd} install "jaraco.functools==4.0.0" || return 1 echodebug "Running '${_pip_cmd} download -d /tmp/git/deps ${_PIP_DOWNLOAD_ARGS} -r requirements/static/ci/py${_py_version}/linux.txt" ${_pip_cmd} download -d /tmp/git/deps ${_PIP_DOWNLOAD_ARGS} -r "requirements/static/ci/py${_py_version}/linux.txt" else