(MAINT) go back to ubuntu

Author: davidmalloncares

.github/workflows/test-install-matrix.yaml

@@ -37,7 +37,7 @@ jobs:
       matrix:
         architecture: [standard-with-dr]
         version: [2025.6.0]
-        image: [litmusimage/amazonlinux:2023]
+        image: [litmusimage/ubuntu:24.04]
     steps:
       - name: Checkout Source
         uses: actions/checkout@v4
@@ -211,74 +211,6 @@ jobs:
                       echo "=== New Docker transport inventory.yaml ==="
                       cat ./inventory.yaml
                     echo ::endgroup::
-      - name: Prepare containers for Bolt tasks
-        run: |
-          echo ::group::prepare_containers
-            for container in $(docker ps --format "{{.Names}}" | grep -v NAMES); do
-              echo "=== Preparing container: $container ==="
-              
-              # Install required packages for Amazon Linux 2023
-              echo "Installing required packages:"
-              docker exec $container yum update -y || echo "yum update failed"
-              docker exec $container yum install -y \
-                curl \
-                wget \
-                ca-certificates \
-                hostname \
-                procps-ng \
-                util-linux \
-                systemd \
-                openssh-server \
-                openssh-clients \
-                tar \
-                gzip \
-                which \
-                net-tools || echo "Package installation failed"
-              
-              # Ensure hostname command works
-              echo "Testing hostname command:"
-              docker exec $container hostname || echo "hostname command failed"
-              docker exec $container hostname -f || echo "hostname -f command failed"
-              
-              # Ensure /tmp directory exists and has correct permissions
-              echo "Creating and setting permissions for /tmp directory:"
-              docker exec $container mkdir -p /tmp
-              docker exec $container chmod 1777 /tmp
-              docker exec $container ls -ld /tmp
-              
-              # Ensure /var/tmp exists with correct permissions  
-              echo "Creating and setting permissions for /var/tmp directory:"
-              docker exec $container mkdir -p /var/tmp
-              docker exec $container chmod 1777 /var/tmp
-              docker exec $container ls -ld /var/tmp
-              
-              # Create a test file to verify write permissions
-              echo "Testing write permissions:"
-              docker exec $container touch /var/tmp/test_write_permissions || echo "Failed to create test file"
-              docker exec $container rm -f /var/tmp/test_write_permissions || echo "Failed to remove test file"
-              
-              # Ensure other required directories exist
-              echo "Creating other required directories:"
-              docker exec $container mkdir -p /var/log
-              docker exec $container mkdir -p /etc/puppetlabs
-              docker exec $container mkdir -p /opt/puppetlabs
-              
-              # Set up proper hostname resolution
-              echo "Setting up hostname resolution:"
-              container_hostname=$(docker exec $container hostname)
-              docker exec $container bash -c "echo '127.0.0.1 $container_hostname' >> /etc/hosts"
-              
-              # Check available disk space
-              echo "Disk space check:"
-              docker exec $container df -h /var/tmp || echo "Cannot check disk space"
-              
-              # Test basic commands that PE installer might need
-              echo "Testing basic commands:"
-              docker exec $container which curl || echo "curl not found"
-              docker exec $container which tar || echo "tar not found"
-              docker exec $container which systemctl || echo "systemctl not found"
-            done
-          echo ::endgroup::
       - name: Debug container setup
         run: |
           echo ::group::debug_container_setup
@@ -394,6 +326,45 @@ jobs:
               done || echo "Password authentication failed"
             done
           echo ::endgroup::  
+      - name: Prepare containers for Bolt tasks
+        run: |
+          echo ::group::prepare_containers
+            for container in $(docker ps --format "{{.Names}}" | grep -v NAMES); do
+              echo "=== Preparing container: $container ==="
+              
+              # Install required packages
+              echo "Installing required packages:"
+              docker exec $container apt-get update || echo "apt-get update failed"
+              docker exec $container apt-get install -y curl wget ca-certificates || echo "Package installation failed"
+              
+              # Ensure /tmp directory exists and has correct permissions
+              echo "Creating and setting permissions for /tmp directory:"
+              docker exec $container mkdir -p /tmp
+              docker exec $container chmod 1777 /tmp
+              docker exec $container ls -ld /tmp
+              
+              # Ensure /var/tmp exists with correct permissions  
+              echo "Creating and setting permissions for /var/tmp directory:"
+              docker exec $container mkdir -p /var/tmp
+              docker exec $container chmod 1777 /var/tmp
+              docker exec $container ls -ld /var/tmp
+              
+              # Create a test file to verify write permissions
+              echo "Testing write permissions:"
+              docker exec $container touch /var/tmp/test_write_permissions || echo "Failed to create test file"
+              docker exec $container rm -f /var/tmp/test_write_permissions || echo "Failed to remove test file"
+              
+              # Ensure other required directories exist
+              echo "Creating other required directories:"
+              docker exec $container mkdir -p /var/log
+              docker exec $container mkdir -p /etc/puppetlabs
+              docker exec $container mkdir -p /opt/puppetlabs
+              
+              # Check available disk space
+              echo "Disk space check:"
+              docker exec $container df -h /var/tmp || echo "Cannot check disk space"
+            done
+          echo ::endgroup::
       - name: Install PE on test cluster
         timeout-minutes: 120
         run: |