From e2fee99735169c2e0303ea0aab3cb34509b3cb32 Mon Sep 17 00:00:00 2001
From: Heinrich Apfelmus <apfelmus@quantentunnel.de>
Date: Mon, 5 Feb 2024 17:29:16 +0100
Subject: [PATCH] Minor polishing of Buildkite pipelines

---
 .buildkite/nightly.yml  | 11 ++++++-----
 .buildkite/pipeline.yml |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.buildkite/nightly.yml b/.buildkite/nightly.yml
index 310682de355..ee577c83e13 100644
--- a/.buildkite/nightly.yml
+++ b/.buildkite/nightly.yml
@@ -4,6 +4,7 @@ env:
 
   # Per-host variables - shared across containers on host
   macos: "aarch64-darwin"
+  linux: "x86_64-linux"
 
 steps:
   - label: 'Check auto-generated Nix on macOS'
@@ -26,7 +27,7 @@ steps:
     command: "./.buildkite/bench-restore.sh mainnet"
     timeout_in_minutes: 1200
     agents:
-      system: x86_64-linux
+      system: ${linux}
       queue: adrestia-bench
     if: 'build.env("step") == null || build.env("step") =~ /restore-mainnet/'
 
@@ -34,7 +35,7 @@ steps:
     command: "./.buildkite/bench-api.sh"
     timeout_in_minutes: 210
     agents:
-      system: x86_64-linux
+      system: ${linux}
       queue: adrestia-bench
     if: 'build.env("step") == null || build.env("step") =~ /bench-api/'
 
@@ -42,7 +43,7 @@ steps:
     command: "./.buildkite/bench-db.sh"
     timeout_in_minutes: 240
     agents:
-      system: x86_64-linux
+      system: ${linux}
       queue: adrestia-bench
     if: 'build.env("step") == null || build.env("step") =~ /bench-db/'
 
@@ -50,7 +51,7 @@ steps:
     command: "./.buildkite/bench-latency.sh"
     timeout_in_minutes: 120
     agents:
-      system: x86_64-linux
+      system: ${linux}
       queue: adrestia-bench
     if: 'build.env("step") == null || build.env("step") =~ /bench-latency/'
 
@@ -58,7 +59,7 @@ steps:
     command: "./.buildkite/bench-memory.sh"
     timeout_in_minutes: 30
     agents:
-      system: x86_64-linux
+      system: ${linux}
       queue: adrestia-bench
     if: 'build.env("step") == null || build.env("step") =~ /bench-memory/'
 
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 40918108f3d..b8be5facf41 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -191,8 +191,8 @@ steps:
       system: ${macos}
 
   - label: 'Run unit tests (macOS, arm64)'
+    key: macos-tests-arm64
     depends_on: macos-nix
-    key: macos-build-tests-arm64
     command: 'nix build -L .#ci.aarch64-darwin.tests.run.unit'
     agents:
       system: ${macos}