Disambiguate architectures

donoghuc · donoghuc · commit 976f104e506c · 2025-03-28T15:38:41.000-07:00
Eventually we will want to do proper annotations with manifests but for now
just add arch to the tag.
diff --git a/.buildkite/scripts/dra/build-and-push-observability-sre.sh b/.buildkite/scripts/dra/build-and-push-observability-sre.sh
@@ -14,17 +14,26 @@ QUALIFIED_VERSION="$(.buildkite/scripts/common/qualified-version.sh)"
 SHA="$(git rev-parse --short HEAD)"
 REGISTRY_PATH=docker.elastic.co/logstash/logstash-observability-sre
 
+# Add architecture to the tags
+ARCH_TAG="${ARCH:-x86_64}"  # Default to x86_64 if ARCH is not set
+
+echo "Architecture: ${ARCH_TAG}"
+
 if [[ "${WORKFLOW_TYPE}" == "staging" ]]; then
-    # For staging builds, Push the original qualified version
-    # Ex: docker.elastic.co/logstash/logstash-observability-sre:8.19.0
-    docker push ${REGISTRY_PATH}:${QUALIFIED_VERSION}
+    # For staging builds, Push the original qualified version with architecture
+    # Ex: docker.elastic.co/logstash/logstash-observability-sre:8.19.0-aarch64
+    ARCH_VERSION_TAG="${QUALIFIED_VERSION}-${ARCH_TAG}"
+    echo "Tagging and pushing: ${REGISTRY_PATH}:${QUALIFIED_VERSION} as ${REGISTRY_PATH}:${ARCH_VERSION_TAG}"
+    docker tag ${REGISTRY_PATH}:${QUALIFIED_VERSION} ${REGISTRY_PATH}:${ARCH_VERSION_TAG}
+    docker push ${REGISTRY_PATH}:${ARCH_VERSION_TAG}
 fi
 
-# For both staging and snapshot builds push the qualified version + the sha 
-# Ex: docker.elastic.co/logstash/logstash-observability-sre:8.19.0-SNAPSHOT-297226b1df
-SHA_TAG="${QUALIFIED_VERSION}-${SHA}"
-docker tag ${REGISTRY_PATH}:${QUALIFIED_VERSION} ${REGISTRY_PATH}:${SHA_TAG}
-docker push ${REGISTRY_PATH}:${SHA_TAG}
+# For both staging and snapshot builds push the qualified version + the sha + architecture
+# Ex: docker.elastic.co/logstash/logstash-observability-sre:8.19.0-SNAPSHOT-297226b1df-aarch64
+SHA_ARCH_TAG="${QUALIFIED_VERSION}-${SHA}-${ARCH_TAG}"
+echo "Tagging and pushing: ${REGISTRY_PATH}:${QUALIFIED_VERSION} as ${REGISTRY_PATH}:${SHA_ARCH_TAG}"
+docker tag ${REGISTRY_PATH}:${QUALIFIED_VERSION} ${REGISTRY_PATH}:${SHA_ARCH_TAG}
+docker push ${REGISTRY_PATH}:${SHA_ARCH_TAG}
 
 # Teardown Docker environment
 source .buildkite/scripts/dra/docker-env-teardown.sh
diff --git a/.buildkite/scripts/dra/generatesteps.py b/.buildkite/scripts/dra/generatesteps.py
@@ -84,6 +84,8 @@ def ship_observability_sre_image_steps(branch, workflow_type):
 - label: ":package: Build & Ship aarch64 ObservabilitySRE container / {branch}-{workflow_type.upper()}"
   key: "logstash_build_and_ship_observability_sre_aarch64"
   soft_fail: true
+  # TODO: un-comment when we want this step to run after other DRA steps
+  # depends_on: logstash_publish_dra
   agents:
     provider: aws
     imagePrefix: platform-ingest-logstash-ubuntu-2204-aarch64
@@ -100,6 +102,8 @@ def ship_observability_sre_image_steps(branch, workflow_type):
 - label: ":package: Build & Ship x86_64 ObservabilitySRE container / {branch}-{workflow_type.upper()}"
   key: "logstash_build_and_ship_observability_sre_x86_64"
   soft_fail: true
+  # TODO: un-comment when we want this step to run after other DRA steps
+  # depends_on: logstash_publish_dra
   agents:
     provider: gcp
     imageProject: elastic-images-prod
