From 701c69cd2df466aae681046baa0705e6d9a3639f Mon Sep 17 00:00:00 2001
From: Matthias Frei <matzf@scion.org>
Date: Fri, 15 Dec 2023 10:03:06 +0100
Subject: [PATCH] fixup ci

---
 .buildkite/pipeline.yml    | 8 ++++++--
 .buildkite/pipeline_lib.sh | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 4a5fc4dfb2..5af51a3722 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -105,8 +105,6 @@ steps:
   - wait
   - group: "End to End"
     key: e2e
-    concurrency_group: "${BUILDKITE_PIPELINE_ID}/${BUILDKITE_BUILD_NUMBER}"
-    concurrency: 3
     steps:
     - label: "E2E: default :man_in_business_suit_levitating: (scion, ping)"
       command:
@@ -135,6 +133,8 @@ steps:
       timeout_in_minutes: 15
       key: e2e_integration_tests_v2
       retry: *automatic-retry
+      concurrency_group: "${BUILDKITE_PIPELINE_ID}/${BUILDKITE_BUILD_NUMBER}"
+      concurrency: 3
     - label: "E2E: failing links :man_in_business_suit_levitating:"
       command:
         - echo "--- build"
@@ -150,6 +150,8 @@ steps:
       timeout_in_minutes: 15
       key: e2e_revocation_test_v2
       retry: *automatic-retry
+      concurrency_group: "${BUILDKITE_PIPELINE_ID}/${BUILDKITE_BUILD_NUMBER}"
+      concurrency: 3
     - label: "E2E: default :docker: (ping)"
       command:
         - echo "--- build"
@@ -165,3 +167,5 @@ steps:
       timeout_in_minutes: 15
       key: docker_integration_e2e_default
       retry: *automatic-retry
+      concurrency_group: "${BUILDKITE_PIPELINE_ID}/${BUILDKITE_BUILD_NUMBER}"
+      concurrency: 3
diff --git a/.buildkite/pipeline_lib.sh b/.buildkite/pipeline_lib.sh
index 4c6a803cf3..60a884eb07 100644
--- a/.buildkite/pipeline_lib.sh
+++ b/.buildkite/pipeline_lib.sh
@@ -5,8 +5,6 @@ gen_bazel_test_steps() {
     parallel="${PARALLELISM:-1}"
     echo "  - group: \"Integration Tests :bazel:\""
     echo "    key: integration-tests"
-    echo "    concurrency_group: \"\${BUILDKITE_PIPELINE_ID}/\${BUILDKITE_BUILD_NUMBER}\""
-    echo "    concurrency: 3"
     echo "    steps:"
 
     targets="$(bazel query "attr(tags, integration, tests(//...)) except attr(tags, \"lint|manual\", tests(//...))" 2>/dev/null)"
@@ -58,5 +56,7 @@ gen_bazel_test_steps() {
         echo "          automatic:"
         echo "            - exit_status: -1 # Agent was lost"
         echo "            - exit_status: 255 # Forced agent shutdown"
+        echo "        concurrency_group: \"\${BUILDKITE_PIPELINE_ID}/\${BUILDKITE_BUILD_NUMBER}\""
+        echo "        concurrency: 3"
     done
 }