Debugging Amazon 2023

saltstack · Jul 11, 2024 · 26f9248 · 26f9248
1 parent 02aa3bb
commit 26f9248
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 351 deletions.
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
@@ -2797,20 +2797,15 @@ EOM
     mkdir /tmp/git/deps
 
     if [ ${DISTRO_NAME_L} = "ubuntu" ] && [ "$DISTRO_MAJOR_VERSION" -eq 22 ]; then
-        echodebug "DGM Ubuntu 22.04 has problem with base.txt requirements file, not parsing sys_platform == 'win32', trying upgrading pip"
+        echodebug "Ubuntu 22.04 has problem with base.txt requirements file, not parsing sys_platform == 'win32', upgrading from default pip works"
         echodebug "${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --upgrade  pip"
         ${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --upgrade  pip || (echo "Failed to upgrade pip" && return 1)
     fi
 
     echoinfo "Downloading Salt Dependencies from PyPi"
     echodebug "Running '${_pip_cmd} download -d /tmp/git/deps ${_PIP_DOWNLOAD_ARGS} .'"
     ## DGM ${_pip_cmd} download -d /tmp/git/deps "${_PIP_DOWNLOAD_ARGS}" . || (echo "Failed to download salt dependencies" && return 1)
-
-    ## DGM ${_pip_cmd} download -d /tmp/git/deps ${_PIP_DOWNLOAD_ARGS} . || (echo "Failed to download salt dependencies" && return 1)
-    ${_pip_cmd} download -vvv -d /tmp/git/deps ${_PIP_DOWNLOAD_ARGS} . || (echo "Failed to download salt dependencies" && return 1)
-
-    echodebug "DGM checking salt deps downloaded"
-    ls -alrth /tmp/git/deps/*
+    ${_pip_cmd} download -d /tmp/git/deps ${_PIP_DOWNLOAD_ARGS} . || (echo "Failed to download salt dependencies" && return 1)
 
     echoinfo "Installing Downloaded Salt Dependencies"
     echodebug "Running '${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed ${_POST_NEON_PIP_INSTALL_ARGS} /tmp/git/deps/*'"

diff --git a/btstrap-build.linux.yml b/btstrap-build.linux.yml
diff --git a/btstrap-build.macos.yml b/btstrap-build.macos.yml
diff --git a/btstrap-build.windows.yml b/btstrap-build.windows.yml
diff --git a/kitchen.yml b/kitchen.yml
@@ -47,10 +47,11 @@ platforms:
     driver:
       image: amazonlinux:2023
       ## DGM platform: fedora
-      platform: rhel
+      ## DGM platform: rhel
       provision_command:
         ## DGM - yum -y install procps-ng
         - yum -y install --allowerasing procps-ng curl
+        - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
   - name: arch
     driver:
       image: archlinux/archlinux