Move POC code into DRA pipeline

This commit takes the POC from the pull_request_pipeline and adds it to the DRA
pipeline. Noteably, we take care to not disrupt anything about the existing DRA
pipeline by making this wait until after the artifacts are published and we set
a soft_fail. While this is being introduced and stabilized we want to ensure the
existing DRA pipeline continues to work without interruption. As we get more
stability we can look at a tigther integration.

Author: donoghuc

.buildkite/pull_request_pipeline.yml

@@ -142,30 +142,6 @@ steps:
       docker run docker.elastic.co/logstash/logstash-observability-sre:$${QUALIFIED_VERSION} \
         logstash -e 'input { generator { count => 3 } } output { stdout { codec => rubydebug } }'
 
-  - label: "Observability SRE publishing POC"
-    key: "observability-sre-container-publishing-poc"
-    agents:
-      provider: gcp
-      imageProject: elastic-images-prod
-      image: family/platform-ingest-logstash-ubuntu-2204
-      machineType: "n2-standard-4"
-      diskSizeGb: 64
-    command: |
-      set -euo pipefail
-      source .buildkite/scripts/common/vm-agent.sh
-      source .buildkite/scripts/dra/docker-env-setup.sh
-      docker_login
-      QUALIFIED_VERSION="$(.buildkite/scripts/common/qualified-version.sh)"
-      SHA="$(git rev-parse --short HEAD)"
-      DOCKER_REPOSITORY=docker.elastic.co/logstash/logstash-observability-sre
-      echo $${DOCKER_REPOSITORY}:$${QUALIFIED_VERSION}-$${SHA}
-      ./gradlew --stacktrace artifactDockerObservabilitySRE -PfedrampHighMode=true
-      docker tag $${DOCKER_REPOSITORY}:$${QUALIFIED_VERSION} $${DOCKER_REPOSITORY}:$${QUALIFIED_VERSION}-$${SHA}
-      docker push $${DOCKER_REPOSITORY}:$${QUALIFIED_VERSION}-$${SHA}
-      docker tag $${DOCKER_REPOSITORY}:$${QUALIFIED_VERSION} $${DOCKER_REPOSITORY}:$${QUALIFIED_VERSION}-latest
-      docker push $${DOCKER_REPOSITORY}:$${QUALIFIED_VERSION}-latest
-      source .buildkite/scripts/dra/docker-env-teardown.sh
-
   - label: ":lab_coat: Integration Tests - FIPS mode / part 1-of-3"
     key: "integration-tests-fips-part-1-of-3"
     agents:

.buildkite/scripts/dra/build-and-push-observability-sre.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+# Script to build and publish ObservabilitySRE container
+
+echo "Setting up environment"
+source .buildkite/scripts/common/vm-agent.sh
+source .buildkite/scripts/dra/docker-env-setup.sh
+
+echo "Building ObservabilitySRE container"
+./gradlew --stacktrace artifactDockerObservabilitySRE -PfedrampHighMode=true
+
+echo "Pushing ObservabilitySRE container to Docker repository"
+docker_login
+QUALIFIED_VERSION="$(.buildkite/scripts/common/qualified-version.sh)"
+SHA="$(git rev-parse --short HEAD)"
+REGISTRY_PATH=docker.elastic.co/logstash/logstash-observability-sre
+
+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}
+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}
+
+# Teardown Docker environment
+source .buildkite/scripts/dra/docker-env-teardown.sh

.buildkite/scripts/dra/generatesteps.py

@@ -79,6 +79,44 @@ def package_aarch64_docker_step(branch, workflow_type):
 
     return step
 
+def ship_observability_sre_image_steps(branch, workflow_type):
+    step = f'''
+- label: ":package: Build & Ship aarch64 ObservabilitySRE container / {branch}-{workflow_type.upper()}"
+  key: "logstash_build_and_ship_observability_sre_aarch64"
+  soft_fail: true
+  agents:
+    provider: aws
+    imagePrefix: platform-ingest-logstash-ubuntu-2204-aarch64
+    instanceType: "m6g.4xlarge"
+    diskSizeGb: 200
+  artifact_paths:
+    - "**/*.hprof"
+  command: |
+    export WORKFLOW_TYPE="{workflow_type}"
+    export PATH="/opt/buildkite-agent/.rbenv/bin:/opt/buildkite-agent/.pyenv/bin:$PATH"
+    export ARCH="aarch64"
+    eval "$(rbenv init -)"
+    .buildkite/scripts/dra/build-and-push-observability-sre.sh
+- label: ":package: Build & Ship x86_64 ObservabilitySRE container / {branch}-{workflow_type.upper()}"
+  key: "logstash_build_and_ship_observability_sre_x86_64"
+  soft_fail: true
+  agents:
+    provider: gcp
+    imageProject: elastic-images-prod
+    image: family/platform-ingest-logstash-ubuntu-2204
+    machineType: "n2-standard-16"
+    diskSizeGb: 200
+  artifact_paths:
+    - "**/*.hprof"
+  command: |
+    export WORKFLOW_TYPE="{workflow_type}"
+    export PATH="/opt/buildkite-agent/.rbenv/bin:/opt/buildkite-agent/.pyenv/bin:$PATH"
+    export ARCH="x86_64"
+    eval "$(rbenv init -)"
+    .buildkite/scripts/dra/build-and-push-observability-sre.sh
+'''
+    return step
+
 def publish_dra_step(branch, workflow_type, depends_on):
     step = f'''
 - label: ":elastic-stack: Publish  / {branch}-{workflow_type.upper()} DRA artifacts"
@@ -139,9 +177,14 @@ def build_steps_to_yaml(branch, workflow_type):
             "steps": build_steps_to_yaml(branch, workflow_type),
         })
 
-        # Final step: pull artifacts built above and publish them via the release-manager
+        # Pull artifacts built above and publish them via the release-manager
         structure["steps"].extend(
             yaml.safe_load(publish_dra_step(branch, workflow_type, depends_on=group_key)),
         )
 
+        # Once published, do the same for observabilitySRE image
+        structure["steps"].extend(
+            yaml.safe_load(ship_observability_sre_image_steps(branch, workflow_type)),
+        )
+
     print(YAML_HEADER + yaml.dump(structure, Dumper=yaml.Dumper, sort_keys=False))