From bbd6498cd80e7fd70107c4acbe0e8cd247ccdd39 Mon Sep 17 00:00:00 2001 From: David Murphy Date: Wed, 3 Jul 2024 11:36:05 -0600 Subject: [PATCH] Removed support for Centos Stream 8, EOL 2024-05-31, and added more debug, and revisited git for Debian and Ubuntu --- .github/workflows/ci.yml | 15 - .github/workflows/templates/generate.py | 10 +- bootstrap-salt.sh | 399 +++++++++++++----------- kitchen.yml | 6 +- 4 files changed, 222 insertions(+), 208 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a684581..b0ea9d7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -260,20 +260,6 @@ jobs: instances: '["git-master", "latest", "default"]' - centos-stream8: - name: CentOS Stream 8 - 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: centos-stream8 - display-name: CentOS Stream 8 - timeout: 20 - instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]' - - centos-stream9: name: CentOS Stream 9 if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' @@ -543,7 +529,6 @@ jobs: - amazon-2 - amazon-2023 - arch - - centos-stream8 - centos-stream9 - debian-11 - debian-12 diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index b41f63d..72c0c10 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -6,13 +6,13 @@ import pathlib os.chdir(os.path.abspath(os.path.dirname(__file__))) +## DGM "centos-stream8", LINUX_DISTROS = [ "almalinux-8", "almalinux-9", "amazon-2", "amazon-2023", "arch", - "centos-stream8", "centos-stream9", "debian-11", "debian-12", @@ -43,13 +43,13 @@ OSX = [ ] +## DGM "centos-stream8", STABLE_DISTROS = [ "almalinux-8", "almalinux-9", "amazon-2", "amazon-2023", "arch", - "centos-stream8", "centos-stream9", "debian-11", "debian-12", @@ -68,12 +68,12 @@ STABLE_DISTROS = [ "ubuntu-2404", ] +## DGM "centos-stream8", ONEDIR_DISTROS = [ "almalinux-8", "almalinux-9", "amazon-2", "amazon-2023", - "centos-stream8", "centos-stream9", "debian-11", "debian-12", @@ -222,9 +222,9 @@ GIT_VERSION_BLACKLIST = [ # SetuptoolsDeprecationWarning: setup.py install is deprecated. # Use build and pip and other standards-based tools. # +## DGM "centos-stream8", GIT_DISTRO_BLACKLIST = [ "almalinux-8", - "centos-stream8", "fedora-39", "opensuse-15", "oraclelinux-8", @@ -236,13 +236,13 @@ LATEST_PKG_BLACKLIST = [ "gentoo-systemd", ] +## DGM "centos-stream8": "CentOS Stream 8", DISTRO_DISPLAY_NAMES = { "almalinux-8": "AlmaLinux 8", "almalinux-9": "AlmaLinux 9", "amazon-2": "Amazon 2", "amazon-2023": "Amazon 2023", "arch": "Arch", - "centos-stream8": "CentOS Stream 8", "centos-stream9": "CentOS Stream 9", "debian-11": "Debian 11", "debian-12": "Debian 12", diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index f8d8914..e1cca97 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -619,7 +619,6 @@ if [ "$ITYPE" = "git" ]; then # Disable shell warning about unbound variable during git install STABLE_REV="latest" - ONEDIR_REV="latest" # If doing stable install, check if version specified elif [ "$ITYPE" = "stable" ]; then @@ -2107,6 +2106,9 @@ __tdnf_install_noinput() { # specific revision. #---------------------------------------------------------------------------------------------------------------------- __git_clone_and_checkout() { + ## DGM Debugging + set -v + set -x echodebug "Installed git version: $(git --version | awk '{ print $3 }')" # Turn off SSL verification if -I flag was set for insecure downloads @@ -2947,61 +2949,63 @@ __enable_universe_repository() { return 0 } -## DGM __install_saltstack_ubuntu_repository() { -## DGM # Workaround for latest non-LTS Ubuntu -## DGM ## DGM Debugging -## DGM set -v -## DGM set -x -## DGM -## DGM echodebug "DGM Ubuntu A checking STABLE_REV ,${STABLE_REV}, ONEDIR_REV ,$ONEDIR_REV," -## DGM -## DGM if { [ "$DISTRO_MAJOR_VERSION" -eq 20 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; } || \ -## DGM { [ "$DISTRO_MAJOR_VERSION" -eq 22 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; } || \ -## DGM [ "$DISTRO_MAJOR_VERSION" -eq 21 ] || [ "$DISTRO_MAJOR_VERSION" -eq 23 ]; then -## DGM echowarn "Non-LTS Ubuntu detected, but stable packages requested. Trying packages for previous LTS release. You may experience problems." -## DGM UBUNTU_VERSION=24.04 -## DGM UBUNTU_CODENAME="noble" -## DGM else -## DGM UBUNTU_VERSION=${DISTRO_VERSION} -## DGM UBUNTU_CODENAME=${DISTRO_CODENAME} -## DGM fi -## DGM -## DGM # Install downloader backend for GPG keys fetching -## DGM __PACKAGES='wget' -## DGM -## DGM # Required as it is not installed by default on Ubuntu 18+ -## DGM if [ "$DISTRO_MAJOR_VERSION" -ge 18 ]; then -## DGM __PACKAGES="${__PACKAGES} gnupg" -## DGM fi -## DGM -## DGM # Make sure https transport is available -## DGM if [ "$HTTP_VAL" = "https" ] ; then -## DGM __PACKAGES="${__PACKAGES} apt-transport-https ca-certificates" -## DGM fi -## DGM -## DGM ## DGM tornado appears to be missing in 3006.x pkg requirements -## DGM ## DGM __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-tornado" -## DGM -## DGM ## DGM include hwclock if not part of base OS (23.10 and up) -## DGM if [ ! -f /usr/sbin/hwclock ]; then -## DGM __PACKAGES="${__PACKAGES} util-linux-extra" -## DGM fi -## DGM -## DGM # shellcheck disable=SC2086,SC2090 -## DGM __apt_get_install_noinput ${__PACKAGES} || return 1 -## DGM -## DGM if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -ne 3 ]; then -## DGM echoerror "Python version is not supported, only Python 3" -## DGM return 1 -## DGM fi -## DGM -## DGM # SaltStack's stable Ubuntu repository: -## DGM SALTSTACK_UBUNTU_URL="${HTTP_VAL}://${_REPO_URL}/${_ONEDIR_DIR}/${__PY_VERSION_REPO}/ubuntu/${UBUNTU_VERSION}/${__REPO_ARCH}/${STABLE_REV}" -## DGM echo "$__REPO_ARCH_DEB $SALTSTACK_UBUNTU_URL $UBUNTU_CODENAME main" > /etc/apt/sources.list.d/salt.list -## DGM __apt_key_fetch "$SALTSTACK_UBUNTU_URL/SALT-PROJECT-GPG-PUBKEY-2023.gpg" || return 1 -## DGM -## DGM __wait_for_apt apt-get update || return 1 -## DGM } +__install_saltstack_ubuntu_repository() { + # Workaround for latest non-LTS Ubuntu + ## DGM Debugging + set -v + set -x + + echodebug "__install_saltstack_ubuntu_repository() entry" + + echodebug "DGM Ubuntu D checking STABLE_REV ,${STABLE_REV}," + + if { [ "$DISTRO_MAJOR_VERSION" -eq 20 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; } || \ + { [ "$DISTRO_MAJOR_VERSION" -eq 22 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; } || \ + [ "$DISTRO_MAJOR_VERSION" -eq 21 ] || [ "$DISTRO_MAJOR_VERSION" -eq 23 ]; then + echowarn "Non-LTS Ubuntu detected, but stable packages requested. Trying packages for previous LTS release. You may experience problems." + UBUNTU_VERSION=24.04 + UBUNTU_CODENAME="noble" + else + UBUNTU_VERSION=${DISTRO_VERSION} + UBUNTU_CODENAME=${DISTRO_CODENAME} + fi + + # Install downloader backend for GPG keys fetching + __PACKAGES='wget' + + # Required as it is not installed by default on Ubuntu 18+ + if [ "$DISTRO_MAJOR_VERSION" -ge 18 ]; then + __PACKAGES="${__PACKAGES} gnupg" + fi + + # Make sure https transport is available + if [ "$HTTP_VAL" = "https" ] ; then + __PACKAGES="${__PACKAGES} apt-transport-https ca-certificates" + fi + + ## DGM tornado appears to be missing in 3006.x pkg requirements + ## DGM __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-tornado" + + ## DGM include hwclock if not part of base OS (23.10 and up) + if [ ! -f /usr/sbin/hwclock ]; then + __PACKAGES="${__PACKAGES} util-linux-extra" + fi + + # shellcheck disable=SC2086,SC2090 + __apt_get_install_noinput ${__PACKAGES} || return 1 + + if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -ne 3 ]; then + echoerror "Python version is not supported, only Python 3" + return 1 + fi + + # SaltStack's stable Ubuntu repository: + SALTSTACK_UBUNTU_URL="${HTTP_VAL}://${_REPO_URL}/${_ONEDIR_DIR}/${__PY_VERSION_REPO}/ubuntu/${UBUNTU_VERSION}/${__REPO_ARCH}/${STABLE_REV}" + echo "$__REPO_ARCH_DEB $SALTSTACK_UBUNTU_URL $UBUNTU_CODENAME main" > /etc/apt/sources.list.d/salt.list + __apt_key_fetch "$SALTSTACK_UBUNTU_URL/SALT-PROJECT-GPG-PUBKEY-2023.gpg" || return 1 + + __wait_for_apt apt-get update || return 1 +} __install_saltstack_ubuntu_onedir_repository() { # Workaround for latest non-LTS Ubuntu @@ -3113,44 +3117,52 @@ install_ubuntu_deps() { return 0 } -## DGM install_ubuntu_stable_deps() { -## DGM if [ "$_START_DAEMONS" -eq $BS_FALSE ]; then -## DGM echowarn "Not starting daemons on Debian based distributions is not working mostly because starting them is the default behaviour." -## DGM fi -## DGM -## DGM # No user interaction, libc6 restart services for example -## DGM export DEBIAN_FRONTEND=noninteractive -## DGM -## DGM __wait_for_apt apt-get update || return 1 -## DGM -## DGM if [ "${_UPGRADE_SYS}" -eq $BS_TRUE ]; then -## DGM if [ "${_INSECURE_DL}" -eq $BS_TRUE ]; then -## DGM ## TBD DGM Need to understand what this code is doing, since '-ge 20' already covers '-ge 21' etc., added 23 & 24 to continue style -## DGM ## also apt-key is deprecated -## DGM if [ "$DISTRO_MAJOR_VERSION" -ge 20 ] || [ "$DISTRO_MAJOR_VERSION" -ge 21 ] || [ "$DISTRO_MAJOR_VERSION" -ge 22 ] || [ "$DISTRO_MAJOR_VERSION" -ge 23 ] || [ "$DISTRO_MAJOR_VERSION" -ge 24 ]; then -## DGM __apt_get_install_noinput --allow-unauthenticated debian-archive-keyring && apt-get update || return 1 -## DGM else -## DGM __apt_get_install_noinput --allow-unauthenticated debian-archive-keyring && -## DGM apt-key update && apt-get update || return 1 -## DGM fi -## DGM fi -## DGM -## DGM __apt_get_upgrade_noinput || return 1 -## DGM fi -## DGM -## DGM if [ "$_DISABLE_REPOS" -eq "$BS_FALSE" ] || [ "$_CUSTOM_REPO_URL" != "null" ]; then -## DGM __check_dpkg_architecture || return 1 -## DGM __install_saltstack_ubuntu_repository || return 1 -## DGM fi -## DGM -## DGM install_ubuntu_deps || return 1 -## DGM } +install_ubuntu_stable_deps() { + ## DGM Debugging + set -v + set -x + + echodebug "install_ubuntu_stable_deps() entry" + + if [ "$_START_DAEMONS" -eq $BS_FALSE ]; then + echowarn "Not starting daemons on Debian based distributions is not working mostly because starting them is the default behaviour." + fi + + # No user interaction, libc6 restart services for example + export DEBIAN_FRONTEND=noninteractive + + __wait_for_apt apt-get update || return 1 + + if [ "${_UPGRADE_SYS}" -eq $BS_TRUE ]; then + if [ "${_INSECURE_DL}" -eq $BS_TRUE ]; then + ## TBD DGM Need to understand what this code is doing, since '-ge 20' already covers '-ge 21' etc., added 23 & 24 to continue style + ## also apt-key is deprecated + if [ "$DISTRO_MAJOR_VERSION" -ge 20 ] || [ "$DISTRO_MAJOR_VERSION" -ge 21 ] || [ "$DISTRO_MAJOR_VERSION" -ge 22 ] || [ "$DISTRO_MAJOR_VERSION" -ge 23 ] || [ "$DISTRO_MAJOR_VERSION" -ge 24 ]; then + __apt_get_install_noinput --allow-unauthenticated debian-archive-keyring && apt-get update || return 1 + else + __apt_get_install_noinput --allow-unauthenticated debian-archive-keyring && + apt-key update && apt-get update || return 1 + fi + fi + + __apt_get_upgrade_noinput || return 1 + fi + + if [ "$_DISABLE_REPOS" -eq "$BS_FALSE" ] || [ "$_CUSTOM_REPO_URL" != "null" ]; then + __check_dpkg_architecture || return 1 + __install_saltstack_ubuntu_repository || return 1 + fi + + install_ubuntu_deps || return 1 +} install_ubuntu_git_deps() { ## DGM Debugging set -v set -x + echodebug "install_ubuntu_git_deps() entry" + __wait_for_apt apt-get update || return 1 if ! __check_command_exists git; then @@ -3184,6 +3196,8 @@ install_ubuntu_git_deps() { # shellcheck disable=SC2086 __apt_get_install_noinput ${__PACKAGES} || return 1 + install_ubuntu_stable_deps || return 1 + # Let's trigger config_salt() if [ "$_TEMP_CONFIG_DIR" = "null" ]; then _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf/" @@ -3490,46 +3504,49 @@ install_ubuntu_check_services() { # # Debian Install Functions # -## DGM __install_saltstack_debian_repository() { -## DGM ## DGM Debugging -## DGM set -v -## DGM set -x -## DGM -## DGM DEBIAN_RELEASE="$DISTRO_MAJOR_VERSION" -## DGM DEBIAN_CODENAME="$DISTRO_CODENAME" -## DGM -## DGM if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -ne 3 ]; then -## DGM echoerror "Python version is no longer supported, only Python 3" -## DGM return 1 -## DGM fi -## DGM -## DGM # Install downloader backend for GPG keys fetching -## DGM __PACKAGES='wget' -## DGM -## DGM # Required as it is not installed by default on Debian 9+ -## DGM if [ "$DISTRO_MAJOR_VERSION" -ge 9 ]; then -## DGM __PACKAGES="${__PACKAGES} gnupg2" -## DGM fi -## DGM -## DGM # Make sure https transport is available -## DGM if [ "$HTTP_VAL" = "https" ] ; then -## DGM __PACKAGES="${__PACKAGES} apt-transport-https ca-certificates" -## DGM fi -## DGM -## DGM ## DGM tornado appears to be missing in 3006.x pkg requirements -## DGM ## DGM __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-tornado" -## DGM -## DGM # shellcheck disable=SC2086,SC2090 -## DGM ## DGM __apt_get_install_noinput "${__PACKAGES}" || return 1 -## DGM __apt_get_install_noinput ${__PACKAGES} || return 1 -## DGM -## DGM SALTSTACK_DEBIAN_URL="${HTTP_VAL}://${_REPO_URL}/${_ONEDIR_DIR}/${__PY_VERSION_REPO}/debian/${DEBIAN_RELEASE}/${__REPO_ARCH}/${STABLE_REV}" -## DGM echo "$__REPO_ARCH_DEB $SALTSTACK_DEBIAN_URL $DEBIAN_CODENAME main" > "/etc/apt/sources.list.d/salt.list" -## DGM -## DGM __apt_key_fetch "$SALTSTACK_DEBIAN_URL/SALT-PROJECT-GPG-PUBKEY-2023.gpg" || return 1 -## DGM -## DGM __wait_for_apt apt-get update || return 1 -## DGM } +__install_saltstack_debian_repository() { + ## DGM Debugging + set -v + set -x + echodebug "__install_saltstack_debian_repository() entry" + + echodebug "DGM Debian C checking STABLE_REV ,${STABLE_REV}," + + DEBIAN_RELEASE="$DISTRO_MAJOR_VERSION" + DEBIAN_CODENAME="$DISTRO_CODENAME" + + if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -ne 3 ]; then + echoerror "Python version is no longer supported, only Python 3" + return 1 + fi + + # Install downloader backend for GPG keys fetching + __PACKAGES='wget' + + # Required as it is not installed by default on Debian 9+ + if [ "$DISTRO_MAJOR_VERSION" -ge 9 ]; then + __PACKAGES="${__PACKAGES} gnupg2" + fi + + # Make sure https transport is available + if [ "$HTTP_VAL" = "https" ] ; then + __PACKAGES="${__PACKAGES} apt-transport-https ca-certificates" + fi + + ## DGM tornado appears to be missing in 3006.x pkg requirements + ## DGM __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-tornado" + + # shellcheck disable=SC2086,SC2090 + ## DGM __apt_get_install_noinput "${__PACKAGES}" || return 1 + __apt_get_install_noinput ${__PACKAGES} || return 1 + + SALTSTACK_DEBIAN_URL="${HTTP_VAL}://${_REPO_URL}/${_ONEDIR_DIR}/${__PY_VERSION_REPO}/debian/${DEBIAN_RELEASE}/${__REPO_ARCH}/${STABLE_REV}" + echo "$__REPO_ARCH_DEB $SALTSTACK_DEBIAN_URL $DEBIAN_CODENAME main" > "/etc/apt/sources.list.d/salt.list" + + __apt_key_fetch "$SALTSTACK_DEBIAN_URL/SALT-PROJECT-GPG-PUBKEY-2023.gpg" || return 1 + + __wait_for_apt apt-get update || return 1 +} __install_saltstack_debian_onedir_repository() { ## DGM Debugging @@ -3579,62 +3596,68 @@ __install_saltstack_debian_onedir_repository() { __wait_for_apt apt-get update || return 1 } -## DGM install_debian_deps() { -## DGM if [ "$_START_DAEMONS" -eq $BS_FALSE ]; then -## DGM echowarn "Not starting daemons on Debian based distributions is not working mostly because starting them is the default behaviour." -## DGM fi -## DGM -## DGM # No user interaction, libc6 restart services for example -## DGM export DEBIAN_FRONTEND=noninteractive -## DGM -## DGM __wait_for_apt apt-get update || return 1 -## DGM -## DGM if [ "${_UPGRADE_SYS}" -eq $BS_TRUE ]; then -## DGM # Try to update GPG keys first if allowed -## DGM if [ "${_INSECURE_DL}" -eq $BS_TRUE ]; then -## DGM if [ "$DISTRO_MAJOR_VERSION" -ge 10 ]; then -## DGM __apt_get_install_noinput --allow-unauthenticated debian-archive-keyring && apt-get update || return 1 -## DGM else -## DGM __apt_get_install_noinput --allow-unauthenticated debian-archive-keyring && -## DGM apt-key update && apt-get update || return 1 -## DGM fi -## DGM fi -## DGM -## DGM __apt_get_upgrade_noinput || return 1 -## DGM fi -## DGM -## DGM if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -ne 3 ]; then -## DGM echoerror "Python version is no longer supported, only Python 3" -## DGM return 1 -## DGM fi -## DGM -## DGM # Additionally install procps and pciutils which allows for Docker bootstraps. See 366#issuecomment-39666813 -## DGM __PACKAGES='procps pciutils' -## DGM -## DGM # YAML module is used for generating custom master/minion configs -## DGM __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-yaml" -## DGM -## DGM ## DGM tornado appears to be missing in 3006.x pkg requirements -## DGM ## DGM __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-tornado" -## DGM -## DGM # shellcheck disable=SC2086 -## DGM ## DGM __apt_get_install_noinput "${__PACKAGES}" || return 1 -## DGM __apt_get_install_noinput ${__PACKAGES} || return 1 -## DGM -## DGM if [ "$_DISABLE_REPOS" -eq "$BS_FALSE" ] || [ "$_CUSTOM_REPO_URL" != "null" ]; then -## DGM __check_dpkg_architecture || return 1 -## DGM __install_saltstack_debian_repository || return 1 -## DGM fi -## DGM -## DGM if [ "${_EXTRA_PACKAGES}" != "" ]; then -## DGM echoinfo "Installing the following extra packages as requested: ${_EXTRA_PACKAGES}" -## DGM # shellcheck disable=SC2086 -## DGM ## DGM __apt_get_install_noinput "${_EXTRA_PACKAGES}" || return 1 -## DGM __apt_get_install_noinput ${_EXTRA_PACKAGES} || return 1 -## DGM fi -## DGM -## DGM return 0 -## DGM } +install_debian_deps() { + ## DGM Debugging + set -v + set -x + + echodebug "install_debian_deps() entry" + + if [ "$_START_DAEMONS" -eq $BS_FALSE ]; then + echowarn "Not starting daemons on Debian based distributions is not working mostly because starting them is the default behaviour." + fi + + # No user interaction, libc6 restart services for example + export DEBIAN_FRONTEND=noninteractive + + __wait_for_apt apt-get update || return 1 + + if [ "${_UPGRADE_SYS}" -eq $BS_TRUE ]; then + # Try to update GPG keys first if allowed + if [ "${_INSECURE_DL}" -eq $BS_TRUE ]; then + if [ "$DISTRO_MAJOR_VERSION" -ge 10 ]; then + __apt_get_install_noinput --allow-unauthenticated debian-archive-keyring && apt-get update || return 1 + else + __apt_get_install_noinput --allow-unauthenticated debian-archive-keyring && + apt-key update && apt-get update || return 1 + fi + fi + + __apt_get_upgrade_noinput || return 1 + fi + + if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -ne 3 ]; then + echoerror "Python version is no longer supported, only Python 3" + return 1 + fi + + # Additionally install procps and pciutils which allows for Docker bootstraps. See 366#issuecomment-39666813 + __PACKAGES='procps pciutils' + + # YAML module is used for generating custom master/minion configs + __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-yaml" + + ## DGM tornado appears to be missing in 3006.x pkg requirements + ## DGM __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-tornado" + + # shellcheck disable=SC2086 + ## DGM __apt_get_install_noinput "${__PACKAGES}" || return 1 + __apt_get_install_noinput ${__PACKAGES} || return 1 + + if [ "$_DISABLE_REPOS" -eq "$BS_FALSE" ] || [ "$_CUSTOM_REPO_URL" != "null" ]; then + __check_dpkg_architecture || return 1 + __install_saltstack_debian_repository || return 1 + fi + + if [ "${_EXTRA_PACKAGES}" != "" ]; then + echoinfo "Installing the following extra packages as requested: ${_EXTRA_PACKAGES}" + # shellcheck disable=SC2086 + ## DGM __apt_get_install_noinput "${_EXTRA_PACKAGES}" || return 1 + __apt_get_install_noinput ${_EXTRA_PACKAGES} || return 1 + fi + + return 0 +} install_debian_onedir_deps() { ## DGM Debugging @@ -3720,7 +3743,13 @@ install_debian_git_pre() { } install_debian_git_deps() { - install_debian_onedir_deps || return 1 + ## DGM Debugging + set -v + set -x + + echodebug "install_debian_git_deps() entry" + + install_debian_deps || return 1 install_debian_git_pre || return 1 if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -ne 3 ]; then diff --git a/kitchen.yml b/kitchen.yml index 6e97072..ee6c8eb 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -66,9 +66,9 @@ platforms: - update-crypto-policies --set DEFAULT:SHA1 ### DGM - update-crypto-policies --set DEFAULT:SHA256 - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - - name: centos-stream8 - driver: - image: quay.io/centos/centos:stream8 + ## DGM - name: centos-stream8 + ## DGM driver: + ## DGM image: quay.io/centos/centos:stream8 - name: debian-11 driver: image: debian:bullseye