patch

Author: LukasAud

.github/workflows/integration_test.yml

@@ -185,15 +185,16 @@ jobs:
         shell: bash
         run: |
           set -Eeuo pipefail
+          set -o pipefail
 
-          # Determine version (from metadata.json), fall back to 0.0.0
+          # --- Determine module version (fallback to 0.0.0)
           VER="$(ruby -rjson -e 'puts JSON.parse(File.read("metadata.json"))["version"]' 2>/dev/null || true)"
-          [[ -n "$VER" ]] || VER="0.0.0"
+          [[ -n "${VER:-}" ]] || VER="0.0.0"
 
+          # --- Build module tarball
           mkdir -p pkg stage && rm -rf stage/puppetlabs-ntp
           mkdir -p stage/puppetlabs-ntp
 
-          # Copy module content, skip CI/build noise
           shopt -s dotglob
           for item in *; do
             case "$item" in
@@ -207,46 +208,83 @@ jobs:
           tar -C stage -czf "${TAR}" puppetlabs-ntp
           echo "Built module archive: ${TAR}"
 
-          # All targets (master + clients)
-          ALL=$(ruby -ryaml -e '
+          # --- Collect all target URIs (master + clients) from inventory
+          ALL="$(ruby -ryaml -e '
             inv = YAML.load_file("spec/fixtures/litmus_inventory.yaml")
-            puts inv.fetch("groups",[]).flat_map{|g| g.fetch("targets",[])}.map{|t| t["uri"]}.join(",")
-          ')
+            puts inv.fetch("groups",[]).flat_map{|g| g.fetch("targets",[]) }.map{|t| t["uri"]}.join(",")
+          ')"
           [[ -n "$ALL" ]] || { echo "No targets found in inventory"; exit 3; }
 
+          # --- Resolve and sanitize master URI for package installs
           MASTER='${{ steps.pe-master.outputs.master_uri }}'
           MASTER=${MASTER//\"/}; MASTER=${MASTER//\'/}
 
-          # Ensure agent/CLI is present (idempotent) and make a friendly symlink
-          bundle exec bolt command run \
-            "/bin/bash -lc '
-              if ! [ -x /opt/puppetlabs/bin/puppet ]; then
-                echo \"Installing puppet-agent from https://${MASTER}:8140...\" >&2
-                curl -ks https://${MASTER}:8140/packages/current/install.bash | bash || exit 1
+          echo "Ensuring puppet CLI present (best-effort) on: $ALL"
+          bundle exec bolt command run "/bin/bash -lc '
+            set -Eeuo pipefail; set -o pipefail
+            if ! command -v puppet >/dev/null 2>&1 && [ ! -x /opt/puppetlabs/bin/puppet ]; then
+              echo \"Installing puppet-agent from https://${MASTER}:8140...\" >&2
+              success=0
+              for i in 1 2 3; do
+                if curl -fsSLk https://${MASTER}:8140/packages/current/install.bash | bash; then
+                  success=1; break
+                fi
+                echo \"Install attempt $i failed; retrying...\" >&2
+                sleep $((i*5))
+              done
+              if [ $success -eq 0 ]; then
+                echo \"WARN: puppet-agent install failed; will continue with tarball fallback.\" >&2
               fi
-              ln -sf /opt/puppetlabs/bin/puppet /usr/bin/puppet || \
+            fi
+            # convenience symlinks if CLI exists
+            if [ -x /opt/puppetlabs/bin/puppet ]; then
+              ln -sf /opt/puppetlabs/bin/puppet /usr/bin/puppet || true
               ln -sf /opt/puppetlabs/bin/puppet /usr/local/bin/puppet || true
-            '" \
+            fi
+            exit 0
+          '" \
             -i spec/fixtures/litmus_inventory.yaml \
             --targets "$ALL" \
             --run-as root
 
-          # Upload & install
+          echo "Uploading module archive to targets..."
           bundle exec bolt file upload "${TAR}" /root/ntp.tgz \
             -i spec/fixtures/litmus_inventory.yaml \
             --targets "$ALL"
 
-          bundle exec bolt command run \
-            "/opt/puppetlabs/bin/puppet module install /root/ntp.tgz --force --ignore-dependencies" \
+          echo "Installing module on targets (uses puppet if present, falls back to unpack)..."
+          bundle exec bolt command run "/bin/bash -lc '
+            set -Eeuo pipefail; set -o pipefail
+            puppet_bin=\$(command -v puppet || echo /opt/puppetlabs/bin/puppet)
+            if [ -x \"\$puppet_bin\" ]; then
+              \"\$puppet_bin\" module install /root/ntp.tgz --force --ignore-dependencies
+            else
+              echo \"WARN: puppet CLI not found; unpacking module into codedir\" >&2
+              mkdir -p /etc/puppetlabs/code/environments/production/modules
+              tar -xzf /root/ntp.tgz -C /etc/puppetlabs/code/environments/production/modules
+            fi
+          '" \
             -i spec/fixtures/litmus_inventory.yaml \
             --targets "$ALL" \
             --run-as root
 
-          # Verify
-          bundle exec bolt command run \
-            "/opt/puppetlabs/bin/puppet module list --tree | egrep -i '(^| )ntp( |$)'" \
+          echo "Verifying module presence..."
+          bundle exec bolt command run "/bin/bash -lc '
+            set -Eeuo pipefail; set -o pipefail
+            if command -v puppet >/dev/null 2>&1 || [ -x /opt/puppetlabs/bin/puppet ]; then
+              puppet_bin=\$(command -v puppet || echo /opt/puppetlabs/bin/puppet)
+              \"\$puppet_bin\" module list --tree | egrep -i \"(^| )ntp( |$)\" || true
+            else
+              if test -d /etc/puppetlabs/code/environments/production/modules/puppetlabs-ntp; then
+                echo \"puppetlabs-ntp present (unpacked)\"
+              else
+                echo \"WARN: ntp module not found\"
+              fi
+            fi
+          '" \
             -i spec/fixtures/litmus_inventory.yaml \
-            --targets "$ALL" || true
+            --targets "$ALL" \
+            --run-as root || true
 
       - name: Run integration tests
         run: |