Merge pull request #3604 from buildkite/pb-991-trigger-the-new-e2e-pipeline

Trigger the new E2E pipeline

Author: DrJosh9000

.buildkite/docker-compose.yml

@@ -42,6 +42,7 @@ services:
       - BUILDKITE_JOB_ID
       - BUILDKITE_BUILD_CREATOR_EMAIL
       - BUILDKITE_BUILD_CREATOR
+      - BUILDKITE_TRIGGERED_FROM_BUILD_ID
       - CI_E2E_TESTS_BUILDKITE_API_TOKEN
       - CI_E2E_TESTS_AGENT_TOKEN
       - CI_E2E_TESTS_TARGET_ORG

.buildkite/pipeline.yml

@@ -44,7 +44,7 @@ steps:
               - "os=linux"
               - "arch=amd64"
               - "race=false"
-  
+
     - name: ":linux: Linux ARM64 Tests"
       key: test-linux-arm64
       command: ".buildkite/steps/tests.sh"
@@ -67,7 +67,7 @@ steps:
               - "os=linux"
               - "arch=arm64"
               - "race=false"
-              
+
     - name: ":windows: Windows AMD64 Tests"
       key: test-windows
       command: "bash .buildkite\\steps\\tests.sh"
@@ -85,7 +85,7 @@ steps:
               - "os=windows"
               - "arch=arm64"
               - "race=false"
-  
+
     - name: ":satellite: Detect Data Races"
       key: test-race-linux-arm64
       command: ".buildkite/steps/tests.sh -race"
@@ -109,7 +109,7 @@ steps:
               - "os=linux"
               - "arch=arm64"
               - "race=true"
-              
+
     - name: ":coverage: Test coverage report Linux ARM64"
       key: test-coverage-linux-arm64
       command: ".buildkite/steps/test-coverage-report.sh"
@@ -126,7 +126,7 @@ steps:
         - artifacts#v1.9.4:
             download: "coverage/**"
             step: test-linux-arm64
-    
+
     - name: ":coverage: Test coverage report Linux AMD64"
       key: test-coverage-linux-amd64
       command: ".buildkite/steps/test-coverage-report.sh"
@@ -143,7 +143,7 @@ steps:
         - artifacts#v1.9.4:
             download: "coverage/**"
             step: test-linux-amd64
-    
+
     - name: ":coverage: Test coverage report Linux ARM64 Race"
       key: test-coverage-linux-arm64-race
       command: ".buildkite/steps/test-coverage-report.sh"
@@ -160,7 +160,7 @@ steps:
         - artifacts#v1.9.4:
             download: "coverage/**"
             step: test-race-linux-arm64
-  
+
     - label: ":writing_hand: Annotate with Test Failures"
       depends_on:
         - test-linux-amd64
@@ -171,7 +171,7 @@ steps:
       plugins:
         - junit-annotate#v1.6.0:
             artifacts: junit-*.xml
-            
+
   # --- end Tests and Coverage ---
 
   - group: ":hammer_and_wrench: Binary builds"
@@ -225,9 +225,23 @@ steps:
 
             - with: { os: openbsd, arch: arm64 }
               skip: "arm64 OpenBSD is not currently supported"
-              
+
   # --- end Binary builds ---
 
+  - label: ":end::two::end: E2E Testing"
+    key: e2e-tests
+    depends_on: build-binary
+    trigger: agent-e2e-tests
+    async: false
+    build:
+      message: "${BUILDKITE_MESSAGE}"
+      commit: "${BUILDKITE_COMMIT}"
+      branch: "${BUILDKITE_BRANCH}"
+      env:
+        BUILDKITE_PULL_REQUEST: "${BUILDKITE_PULL_REQUEST}"
+        BUILDKITE_PULL_REQUEST_BASE_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
+        BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
+
   - label: ":bathtub: Check version string is clean"
     key: check-version-string
     depends_on: build-binary
@@ -340,7 +354,7 @@ steps:
               - ubuntu-22.04
               - ubuntu-24.04
               - sidecar
-              
+
   # --- end Docker Image tests ---
 
   - name: ":debian: Debian package build"

.buildkite/steps/e2e-tests.sh

@@ -1,10 +1,15 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# TODO: download the agent to test as an artifact
-#buildkite-agent artifact download buildkite-agent . --build "${BUILDKITE_TRIGGERED_FROM_BUILD_ID}"
-#export CI_E2E_TESTS_AGENT_PATH="${PWD}/buildkite-agent"
+if [[ -z "${BUILDKITE_TRIGGERED_FROM_BUILD_ID}" ]] ; then
+	# For now, e2e test the agent that's currently running
+	export CI_E2E_TESTS_AGENT_PATH="$(which buildkite-agent)"
+else
+	# Download the artifact from the triggering build
+	ARTIFACT="pkg/buildkite-agent-$(go env GOOS)-$(go env GOARCH)"
+	buildkite-agent artifact download "${ARTIFACT}" . --build "${BUILDKITE_TRIGGERED_FROM_BUILD_ID}"
+	chmod +x "${ARTIFACT}"
+	export CI_E2E_TESTS_AGENT_PATH="${PWD}/${ARTIFACT}"
+fi
 
-# For now, e2e test the agent that's currently running
-export CI_E2E_TESTS_AGENT_PATH="$(which buildkite-agent)"
 go test -v -tags e2e ./internal/e2e/... | sed -e 's/^/>  /'