From 6892ff3507a0fc60df5059056eb208b1ecd3e705 Mon Sep 17 00:00:00 2001
From: Chris Toshok <toshok@gmail.com>
Date: Thu, 22 Feb 2024 21:24:00 -0800
Subject: [PATCH 1/3] run the f2 e2e pipeline for both linux-x86_64 and
 macos-arm64

---
 .buildkite/pipeline.yml | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 3992bd6884ee76..6886a0189e4c16 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -206,12 +206,31 @@ steps:
     depends_on:
       - "build-chromium-linux-x86_64"
 
-  - label: "Trigger FE E2E Tests :hammer:"
+  - label: "Trigger FE E2E Tests (linux-x86_64) :hammer:"
     trigger: "runtime-fe-end-to-end-tests"
     depends_on:
       - "build-chromium-linux-x86_64"
     build:
+      branch: toshok/mac-e2e
       env:
+        OS: "linux"
+        ARCH: "x86_64"
+        RECORD_REPLAY_METADATA_SOURCE_COMMIT_TITLE: "${BUILDKITE_MESSAGE}"
+        RECORD_REPLAY_METADATA_SOURCE_COMMIT_ID: "${BUILDKITE_COMMIT}"
+        RECORD_REPLAY_METADATA_SOURCE_BRANCH: "${BUILDKITE_BRANCH}"
+        RECORD_REPLAY_METADATA_SOURCE_MERGE_ID: "${BUILDKITE_PULL_REQUEST}"
+        # this is passed as a git URL which the replay plugin expects and parses
+        RUNTIME_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
+
+  - label: "Trigger FE E2E Tests (macos-arm64) :hammer:"
+    trigger: "runtime-fe-end-to-end-tests"
+    depends_on:
+      - "build-chromium-mac-arm64"
+    build:
+      branch: toshok/mac-e2e
+      env:
+        OS: "macos"
+        ARCH: "arm64"
         RECORD_REPLAY_METADATA_SOURCE_COMMIT_TITLE: "${BUILDKITE_MESSAGE}"
         RECORD_REPLAY_METADATA_SOURCE_COMMIT_ID: "${BUILDKITE_COMMIT}"
         RECORD_REPLAY_METADATA_SOURCE_BRANCH: "${BUILDKITE_BRANCH}"

From 01341a15c2fe77dfa7c537a69af828585f4722ba Mon Sep 17 00:00:00 2001
From: Chris Toshok <toshok@gmail.com>
Date: Sun, 3 Mar 2024 16:02:33 -0800
Subject: [PATCH 2/3] mark macos-arm64 fe e2e tests soft_fail

---
 .buildkite/pipeline.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 6886a0189e4c16..ff42cfbd618d5c 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -223,6 +223,7 @@ steps:
         RUNTIME_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
 
   - label: "Trigger FE E2E Tests (macos-arm64) :hammer:"
+    soft_fail: true
     trigger: "runtime-fe-end-to-end-tests"
     depends_on:
       - "build-chromium-mac-arm64"

From 70d920857ad29ba499ee34332a19af9499beba1e Mon Sep 17 00:00:00 2001
From: Chris Toshok <toshok@gmail.com>
Date: Mon, 4 Mar 2024 06:56:42 -0800
Subject: [PATCH 3/3] target devtools main branch for when it lands

---
 .buildkite/pipeline.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index ff42cfbd618d5c..57616d81c084f7 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -211,7 +211,6 @@ steps:
     depends_on:
       - "build-chromium-linux-x86_64"
     build:
-      branch: toshok/mac-e2e
       env:
         OS: "linux"
         ARCH: "x86_64"
@@ -228,7 +227,6 @@ steps:
     depends_on:
       - "build-chromium-mac-arm64"
     build:
-      branch: toshok/mac-e2e
       env:
         OS: "macos"
         ARCH: "arm64"