Merge branch 'main' into cf_template_wording_SUP-4542

Author: scadu

.buildkite/scripts/trigger-base-rebuild.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+set -euo pipefail
+
+timestamp=$(date -u +"%Y-%m-%d %H:%M:%S UTC")
+
+echo "# Last updated: ${timestamp}" >"packer/windows/.trigger-base-build"
+echo "# Last updated: ${timestamp}" >"packer/linux/.trigger-base-build"
+
+git add packer/windows/.trigger-base-build packer/linux/.trigger-base-build
+
+echo "Base AMI rebuild triggers updated"

.buildkite/steps/packer.sh

@@ -22,7 +22,7 @@ packer_files_sha=$(find Makefile "packer/${os}" plugins/ -type f -print0 | xargs
 internal_files_sha=$(find go.mod go.sum internal/ -type f -print0 | xargs -0 sha256sum | awk '{print $1}' | sort | sha256sum | awk '{print $1}')
 stable_agent_sha=$(curl -Lfs "https://download.buildkite.com/agent/stable/latest/${agent_binary}.sha256")
 unstable_agent_sha=$(curl -Lfs "https://download.buildkite.com/agent/unstable/latest/${agent_binary}.sha256")
-packer_hash=$(echo "$packer_files_sha" "$internal_files_sha" "$arch" "$stable_agent_sha" "$unstable_agent_sha" | sha256sum | awk '{print $1}')
+packer_hash=$(echo "$packer_files_sha" "$internal_files_sha" "$arch" "$stable_agent_sha" "$unstable_agent_sha" "$variant" | sha256sum | awk '{print $1}')
 
 # Include variant in the hash so base and full images don’t clash
 echo "Packer image hash for ${os}/${arch} (${variant}) is ${packer_hash}"

packer/linux/.trigger-base-build

@@ -0,0 +1 @@
+# Last updated: 2025-09-09 12:36:23 UTC

packer/windows/.trigger-base-build

@@ -0,0 +1 @@
+# Last updated: 2025-09-09 12:36:23 UTC