From d12a0d274a1ffee019e4439acdeb1bad9583d461 Mon Sep 17 00:00:00 2001
From: Brian Seeders <brian.seeders@elastic.co>
Date: Mon, 7 Mar 2022 16:40:20 -0500
Subject: [PATCH] Revert "[ci] Configure hourly pipeline for a small spot
 instance trial (#126824)"

This reverts commit 891b6cd83b62b21a67ef8b625ea5c05d2f0c68a3.
---
 .buildkite/pipelines/hourly.yml | 72 +++++----------------------------
 1 file changed, 9 insertions(+), 63 deletions(-)

diff --git a/.buildkite/pipelines/hourly.yml b/.buildkite/pipelines/hourly.yml
index e5bc841774fde52..78c57ff3bd12852 100644
--- a/.buildkite/pipelines/hourly.yml
+++ b/.buildkite/pipelines/hourly.yml
@@ -56,44 +56,24 @@ steps:
   - command: .buildkite/scripts/steps/functional/oss_accessibility.sh
     label: 'OSS Accessibility Tests'
     agents:
-      queue: n2-4-spot
+      queue: ci-group-4d
     depends_on: build
     timeout_in_minutes: 120
     retry:
       automatic:
-        - exit_status: '1'
+        - exit_status: '*'
           limit: 1
-        - exit_status: '-1'
-          limit: 3
-        - exit_status: '130'
-          limit: 3
-        - exit_status: '137'
-          limit: 3
-        - exit_status: '143'
-          limit: 3
-        - exit_status: '255'
-          limit: 3
 
   - command: .buildkite/scripts/steps/functional/xpack_accessibility.sh
     label: 'Default Accessibility Tests'
     agents:
-      queue: n2-4-spot
+      queue: n2-4
     depends_on: build
     timeout_in_minutes: 120
     retry:
       automatic:
-        - exit_status: '1'
+        - exit_status: '*'
           limit: 1
-        - exit_status: '-1'
-          limit: 3
-        - exit_status: '130'
-          limit: 3
-        - exit_status: '137'
-          limit: 3
-        - exit_status: '143'
-          limit: 3
-        - exit_status: '255'
-          limit: 3
 
   - command: .buildkite/scripts/steps/functional/oss_firefox.sh
     label: 'OSS Firefox Tests'
@@ -109,23 +89,13 @@ steps:
   - command: .buildkite/scripts/steps/functional/xpack_firefox.sh
     label: 'Default Firefox Tests'
     agents:
-      queue: n2-4-spot
+      queue: n2-4
     depends_on: build
     timeout_in_minutes: 120
     retry:
       automatic:
-        - exit_status: '1'
+        - exit_status: '*'
           limit: 1
-        - exit_status: '-1'
-          limit: 3
-        - exit_status: '130'
-          limit: 3
-        - exit_status: '137'
-          limit: 3
-        - exit_status: '143'
-          limit: 3
-        - exit_status: '255'
-          limit: 3
 
   - command: .buildkite/scripts/steps/functional/oss_misc.sh
     label: 'OSS Misc Functional Tests'
@@ -141,23 +111,13 @@ steps:
   - command: .buildkite/scripts/steps/functional/xpack_saved_object_field_metrics.sh
     label: 'Saved Object Field Metrics'
     agents:
-      queue: n2-4-spot
+      queue: n2-4
     depends_on: build
     timeout_in_minutes: 120
     retry:
       automatic:
-        - exit_status: '1'
+        - exit_status: '*'
           limit: 1
-        - exit_status: '-1'
-          limit: 3
-        - exit_status: '130'
-          limit: 3
-        - exit_status: '137'
-          limit: 3
-        - exit_status: '143'
-          limit: 3
-        - exit_status: '255'
-          limit: 3
 
   - command: .buildkite/scripts/steps/test/jest.sh
     label: 'Jest Tests'
@@ -178,23 +138,9 @@ steps:
   - command: .buildkite/scripts/steps/test/api_integration.sh
     label: 'API Integration Tests'
     agents:
-      queue: n2-4-spot
+      queue: n2-2
     timeout_in_minutes: 120
     key: api-integration
-    retry:
-      automatic:
-        - exit_status: '1'
-          limit: 1
-        - exit_status: '-1'
-          limit: 3
-        - exit_status: '130'
-          limit: 3
-        - exit_status: '137'
-          limit: 3
-        - exit_status: '143'
-          limit: 3
-        - exit_status: '255'
-          limit: 3
 
   - command: .buildkite/scripts/steps/lint.sh
     label: 'Linting'