From 14452c49586893c08cca9ba7cc446af2bed50a98 Mon Sep 17 00:00:00 2001
From: David Spickett <david.spickett@linaro.org>
Date: Thu, 17 Mar 2022 09:36:55 +0000
Subject: [PATCH] Revert "[libcxx][CI] Use temporary clang-13 bots for
 Arm/AArch64"

This reverts commit 406d418c0c831287b41c83150369fd8485c3d700.

Our regular bots are now using clang-13. The previous set will remain
online for a while to check reviews that haven't rebased to include
this change yet.

Differential Revision: https://reviews.llvm.org/D121894
---
 libcxx/utils/ci/buildkite-pipeline.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libcxx/utils/ci/buildkite-pipeline.yml b/libcxx/utils/ci/buildkite-pipeline.yml
index 441deefd257fd1..7653ead09ae6c4 100644
--- a/libcxx/utils/ci/buildkite-pipeline.yml
+++ b/libcxx/utils/ci/buildkite-pipeline.yml
@@ -678,7 +678,7 @@ steps:
         - "**/test-results.xml"
         - "**/*.abilist"
       agents:
-        queue: "libcxx-builders-linaro-arm-test"
+        queue: "libcxx-builders-linaro-arm"
         arch: "aarch64"
       retry:
         automatic:
@@ -692,7 +692,7 @@ steps:
         - "**/test-results.xml"
         - "**/*.abilist"
       agents:
-        queue: "libcxx-builders-linaro-arm-test"
+        queue: "libcxx-builders-linaro-arm"
         arch: "aarch64"
       retry:
         automatic:
@@ -706,7 +706,7 @@ steps:
         - "**/test-results.xml"
         - "**/*.abilist"
       agents:
-        queue: "libcxx-builders-linaro-arm-test"
+        queue: "libcxx-builders-linaro-arm"
         arch: "armv8l"
       retry:
         automatic:
@@ -720,7 +720,7 @@ steps:
         - "**/test-results.xml"
         - "**/*.abilist"
       agents:
-        queue: "libcxx-builders-linaro-arm-test"
+        queue: "libcxx-builders-linaro-arm"
         arch: "armv8l"
       retry:
         automatic:
@@ -734,7 +734,7 @@ steps:
         - "**/test-results.xml"
         - "**/*.abilist"
       agents:
-        queue: "libcxx-builders-linaro-arm-test"
+        queue: "libcxx-builders-linaro-arm"
         arch: "armv8l" # Compiling for v7, running on v8 hardware
       retry:
         automatic:
@@ -748,7 +748,7 @@ steps:
         - "**/test-results.xml"
         - "**/*.abilist"
       agents:
-        queue: "libcxx-builders-linaro-arm-test"
+        queue: "libcxx-builders-linaro-arm"
         arch: "armv8l" # Compiling for v7, running on v8 hardware
       retry:
         automatic: