From 4aae98c1aabb937c32cf794fbb3aafd2587d362a Mon Sep 17 00:00:00 2001
From: Olga Naidjonoka <olga_naidjonoka@epam.com>
Date: Mon, 29 Apr 2024 11:15:34 +0300
Subject: [PATCH] checged exit status code for retries

---
 .buildkite/auditbeat/auditbeat-pipeline.yml   | 35 ++++++-----------
 .buildkite/filebeat/filebeat-pipeline.yml     | 33 ++++++----------
 .buildkite/heartbeat/heartbeat-pipeline.yml   | 36 ++++++-----------
 .buildkite/libbeat/pipeline.libbeat.yml       | 18 +++------
 .buildkite/metricbeat/pipeline.yml            | 33 ++++++----------
 .buildkite/packetbeat/pipeline.packetbeat.yml | 30 +++++---------
 .buildkite/winlogbeat/pipeline.winlogbeat.yml | 18 +++------
 .../x-pack/pipeline.xpack.auditbeat.yml       | 30 +++++---------
 .../x-pack/pipeline.xpack.dockerlogbeat.yml   |  6 +--
 .buildkite/x-pack/pipeline.xpack.filebeat.yml | 33 ++++++----------
 .../x-pack/pipeline.xpack.heartbeat.yml       | 27 +++++--------
 .buildkite/x-pack/pipeline.xpack.libbeat.yml  | 27 +++++--------
 .../x-pack/pipeline.xpack.metricbeat.yml      | 30 +++++---------
 .../x-pack/pipeline.xpack.osquerybeat.yml     | 27 +++++--------
 .../x-pack/pipeline.xpack.packetbeat.yml      | 39 +++++++------------
 .../x-pack/pipeline.xpack.winlogbeat.yml      | 18 +++------
 16 files changed, 147 insertions(+), 293 deletions(-)

diff --git a/.buildkite/auditbeat/auditbeat-pipeline.yml b/.buildkite/auditbeat/auditbeat-pipeline.yml
index 548c084ab847..ed19c7d91644 100644
--- a/.buildkite/auditbeat/auditbeat-pipeline.yml
+++ b/.buildkite/auditbeat/auditbeat-pipeline.yml
@@ -13,7 +13,7 @@ env:
   IMAGE_MACOS_ARM: "generic-13-ventura-arm"
   IMAGE_MACOS_X86_64: "generic-13-ventura-x64"
   IMAGE_RHEL9: "family/platform-ingest-beats-rhel-9"
-  IMAGE_UBUNTU_X86_64: "family/platform-ingest-beats-ubuntu-2204-1"
+  IMAGE_UBUNTU_X86_64: "family/platform-ingest-beats-ubuntu-2204"
   IMAGE_WIN_10: "family/platform-ingest-beats-windows-10"
   IMAGE_WIN_11: "family/platform-ingest-beats-windows-11"
   IMAGE_WIN_2016: "family/platform-ingest-beats-windows-2016"
@@ -34,8 +34,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -53,8 +52,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_RHEL9}"
@@ -72,8 +70,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2016}"
@@ -93,8 +90,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2022}"
@@ -115,8 +111,7 @@ steps:
           GOX_FLAGS: "-arch amd64"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -137,8 +132,7 @@ steps:
           mage unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "aws"
           imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
@@ -159,8 +153,7 @@ steps:
           mage unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_X86_64}"
@@ -177,8 +170,7 @@ steps:
           mage unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_ARM}"
@@ -198,8 +190,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2019}"
@@ -218,8 +209,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_10}"
@@ -238,8 +228,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_11}"
diff --git a/.buildkite/filebeat/filebeat-pipeline.yml b/.buildkite/filebeat/filebeat-pipeline.yml
index 99b118aae329..053e8dbec419 100644
--- a/.buildkite/filebeat/filebeat-pipeline.yml
+++ b/.buildkite/filebeat/filebeat-pipeline.yml
@@ -32,8 +32,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -51,8 +50,7 @@ steps:
           mage goIntegTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -70,8 +68,7 @@ steps:
           mage pythonIntegTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: gcp
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -90,8 +87,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2016}"
@@ -112,8 +108,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2022}"
@@ -140,8 +135,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_X86_64}"
@@ -162,8 +156,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_ARM}"
@@ -182,8 +175,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "aws"
           imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
@@ -206,8 +198,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2019}"
@@ -228,8 +219,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_11}"
@@ -250,8 +240,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_10}"
diff --git a/.buildkite/heartbeat/heartbeat-pipeline.yml b/.buildkite/heartbeat/heartbeat-pipeline.yml
index e3bf05615a49..cadbcec1eca2 100644
--- a/.buildkite/heartbeat/heartbeat-pipeline.yml
+++ b/.buildkite/heartbeat/heartbeat-pipeline.yml
@@ -32,8 +32,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -51,8 +50,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_RHEL9}"
@@ -71,8 +69,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2016}"
@@ -92,8 +89,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2022}"
@@ -112,8 +108,7 @@ steps:
           mage goIntegTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -131,8 +126,7 @@ steps:
           mage pythonIntegTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -156,8 +150,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "aws"
           imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
@@ -181,8 +174,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_X86_64}"
@@ -202,8 +194,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_ARM}"
@@ -226,8 +217,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2019}"
@@ -247,8 +237,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_11}"
@@ -268,8 +257,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_10}"
diff --git a/.buildkite/libbeat/pipeline.libbeat.yml b/.buildkite/libbeat/pipeline.libbeat.yml
index a15bdb7286c3..bc77712c330b 100644
--- a/.buildkite/libbeat/pipeline.libbeat.yml
+++ b/.buildkite/libbeat/pipeline.libbeat.yml
@@ -23,8 +23,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -44,8 +43,7 @@ steps:
           mage goIntegTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -65,8 +63,7 @@ steps:
           mage pythonIntegTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -86,8 +83,7 @@ steps:
           make crosscompile
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -107,8 +103,7 @@ steps:
           make STRESS_TEST_OPTIONS='-timeout=20m -race -v -parallel 1' GOTEST_OUTPUT_OPTIONS=' | go-junit-report > libbeat-stress-test.xml' stress-tests
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -130,8 +125,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "aws"
           imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
diff --git a/.buildkite/metricbeat/pipeline.yml b/.buildkite/metricbeat/pipeline.yml
index 945405cd6b31..d15212d2ef32 100644
--- a/.buildkite/metricbeat/pipeline.yml
+++ b/.buildkite/metricbeat/pipeline.yml
@@ -34,8 +34,7 @@ steps:
         command: "cd metricbeat && mage build unitTest"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -68,8 +67,7 @@ steps:
           cd metricbeat && mage goIntegTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -102,8 +100,7 @@ steps:
           cd metricbeat && mage pythonIntegTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -120,8 +117,7 @@ steps:
         command: "make -C metricbeat crosscompile"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -140,8 +136,7 @@ steps:
         key: "mandatory-win-2016-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2016}"
@@ -162,8 +157,7 @@ steps:
         key: "mandatory-win-2022-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2022}"
@@ -188,8 +182,7 @@ steps:
         key: "extended-win-10-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_10}"
@@ -210,8 +203,7 @@ steps:
         key: "extended-win-11-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_11}"
@@ -232,8 +224,7 @@ steps:
         key: "extended-win-2019-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2019}"
@@ -259,8 +250,7 @@ steps:
           cd metricbeat && mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_X86_64}"
@@ -280,8 +270,7 @@ steps:
           cd metricbeat && mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_ARM}"
diff --git a/.buildkite/packetbeat/pipeline.packetbeat.yml b/.buildkite/packetbeat/pipeline.packetbeat.yml
index cdd28991af96..d510107a89c2 100644
--- a/.buildkite/packetbeat/pipeline.packetbeat.yml
+++ b/.buildkite/packetbeat/pipeline.packetbeat.yml
@@ -30,8 +30,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -49,8 +48,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_RHEL9_X86_64}"
@@ -68,8 +66,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2016}"
@@ -89,8 +86,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2022}"
@@ -114,8 +110,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_10}"
@@ -136,8 +131,7 @@ steps:
         key: "extended-win-11-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_11}"
@@ -158,8 +152,7 @@ steps:
         key: "extended-win-2019-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2019}"
@@ -186,8 +179,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_X86_64}"
@@ -208,8 +200,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_ARM}"
@@ -226,8 +217,7 @@ steps:
         if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "aws"
           imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
diff --git a/.buildkite/winlogbeat/pipeline.winlogbeat.yml b/.buildkite/winlogbeat/pipeline.winlogbeat.yml
index 2b59299724fb..ff3327913492 100644
--- a/.buildkite/winlogbeat/pipeline.winlogbeat.yml
+++ b/.buildkite/winlogbeat/pipeline.winlogbeat.yml
@@ -26,8 +26,7 @@ steps:
         command: "make -C winlogbeat crosscompile"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -46,8 +45,7 @@ steps:
         key: "mandatory-win-2016-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2016}"
@@ -68,8 +66,7 @@ steps:
         key: "mandatory-win-2019-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2019}"
@@ -90,8 +87,7 @@ steps:
         key: "mandatory-win-2022-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2022}"
@@ -117,8 +113,7 @@ steps:
         key: "extended-win-10-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_10}"
@@ -139,8 +134,7 @@ steps:
         key: "extended-win-11-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_11}"
diff --git a/.buildkite/x-pack/pipeline.xpack.auditbeat.yml b/.buildkite/x-pack/pipeline.xpack.auditbeat.yml
index bfce65f75797..80c298c725df 100644
--- a/.buildkite/x-pack/pipeline.xpack.auditbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.auditbeat.yml
@@ -38,8 +38,7 @@ steps:
           mage update build test
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -58,8 +57,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_RHEL9_X86_64}"
@@ -78,8 +76,7 @@ steps:
         key: "mandatory-win-2022-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2022}"
@@ -100,8 +97,7 @@ steps:
         key: "mandatory-win-2016-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2016}"
@@ -126,8 +122,7 @@ steps:
         key: "extended-win-2019-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2019}"
@@ -148,8 +143,7 @@ steps:
         key: "extended-win-10-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_10}"
@@ -170,8 +164,7 @@ steps:
         key: "extended-win-11-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_11}"
@@ -197,8 +190,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_X86_64}"
@@ -217,8 +209,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_ARM}"
@@ -239,8 +230,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "aws"
           imagePrefix: "${IMAGE_UBUNTU_ARM_64}"
diff --git a/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml b/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
index 525b13281f1b..a64f7851913b 100644
--- a/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
@@ -30,8 +30,7 @@ steps:
         command: "cd x-pack/dockerlogbeat && mage build unitTest"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -50,8 +49,7 @@ steps:
           MODULE: $MODULE
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
diff --git a/.buildkite/x-pack/pipeline.xpack.filebeat.yml b/.buildkite/x-pack/pipeline.xpack.filebeat.yml
index 39c4c8607717..b7e71e3c3c0a 100644
--- a/.buildkite/x-pack/pipeline.xpack.filebeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.filebeat.yml
@@ -32,8 +32,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -56,8 +55,7 @@ steps:
           cd x-pack/filebeat && mage goIntegTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -80,8 +78,7 @@ steps:
           cd x-pack/filebeat && mage pythonIntegTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -100,8 +97,7 @@ steps:
         key: "x-pack-filebeat-mandatory-win-2022-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2022}"
@@ -122,8 +118,7 @@ steps:
         key: "x-pack-filebeat-mandatory-win-2016-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2016}"
@@ -144,8 +139,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "aws"
           imagePrefix: "${IMAGE_UBUNTU_ARM_64}"
@@ -168,8 +162,7 @@ steps:
         key: "x-pack-filebeat-extended-win-2019-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2019}"
@@ -190,8 +183,7 @@ steps:
         key: "x-pack-filebeat-extended-win-10-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_10}"
@@ -212,8 +204,7 @@ steps:
         key: "x-pack-filebeat-extended-win-11-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_11}"
@@ -238,8 +229,7 @@ steps:
           cd x-pack/filebeat && mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_X86_64}"
@@ -259,8 +249,7 @@ steps:
           cd x-pack/filebeat && mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_ARM}"
diff --git a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml
index 0065399460b2..136706e698cc 100644
--- a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml
@@ -41,8 +41,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -65,8 +64,7 @@ steps:
           mage goIntegTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -86,8 +84,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2016}"
@@ -109,8 +106,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2022}"
@@ -136,8 +132,7 @@ steps:
         key: "extended-win-10-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_10}"
@@ -158,8 +153,7 @@ steps:
         key: "extended-win-11-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_11}"
@@ -179,8 +173,7 @@ steps:
           mage build test
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         key: "extended-win-2019-unit-tests"
         agents:
           provider: "gcp"
@@ -209,8 +202,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_X86_64}"
@@ -231,8 +223,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_ARM}"
diff --git a/.buildkite/x-pack/pipeline.xpack.libbeat.yml b/.buildkite/x-pack/pipeline.xpack.libbeat.yml
index 615c27d8fded..6bf456f6d83d 100644
--- a/.buildkite/x-pack/pipeline.xpack.libbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.libbeat.yml
@@ -28,8 +28,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -48,8 +47,7 @@ steps:
           mage goIntegTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -68,8 +66,7 @@ steps:
           mage pythonIntegTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -88,8 +85,7 @@ steps:
         key: "mandatory-win-2016-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2016}"
@@ -110,8 +106,7 @@ steps:
         key: "mandatory-win-2022-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2022}"
@@ -136,8 +131,7 @@ steps:
         key: "extended-win-10-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_10}"
@@ -158,8 +152,7 @@ steps:
         key: "extended-win-11-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_11}"
@@ -180,8 +173,7 @@ steps:
         key: "extended-win-2019-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2019}"
@@ -206,8 +198,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "aws"
           imagePrefix: "${IMAGE_UBUNTU_ARM_64}"
diff --git a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml
index 73974178d1e7..4c1c31521f92 100644
--- a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml
@@ -32,8 +32,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -56,8 +55,7 @@ steps:
           cd x-pack/metricbeat && mage goIntegTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -80,8 +78,7 @@ steps:
           cd x-pack/metricbeat && mage pythonIntegTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -100,8 +97,7 @@ steps:
         key: "mandatory-win-2016-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2016}"
@@ -122,8 +118,7 @@ steps:
         key: "mandatory-win-2022-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2022}"
@@ -148,8 +143,7 @@ steps:
         key: "extended-win-10-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_10}"
@@ -170,8 +164,7 @@ steps:
         key: "extended-win-11-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_11}"
@@ -192,8 +185,7 @@ steps:
         key: "extended-win-2019-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2019}"
@@ -219,8 +211,7 @@ steps:
           cd x-pack/metricbeat && mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_X86_64}"
@@ -240,8 +231,7 @@ steps:
           cd x-pack/metricbeat && mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_ARM}"
diff --git a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml
index a564951b3017..c8ecac79735b 100644
--- a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml
@@ -32,8 +32,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -52,8 +51,7 @@ steps:
           mage goIntegTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -72,8 +70,7 @@ steps:
         key: "mandatory-win-2016-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2016}"
@@ -94,8 +91,7 @@ steps:
         key: "mandatory-win-2022-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2022}"
@@ -120,8 +116,7 @@ steps:
         key: "extended-win-10-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_10}"
@@ -142,8 +137,7 @@ steps:
         key: "extended-win-11-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_11}"
@@ -164,8 +158,7 @@ steps:
         key: "extended-win-2019-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2019}"
@@ -190,8 +183,7 @@ steps:
           cd x-pack/osquerybeat && mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_X86_64}"
@@ -209,8 +201,7 @@ steps:
           cd x-pack/osquerybeat && mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_ARM}"
diff --git a/.buildkite/x-pack/pipeline.xpack.packetbeat.yml b/.buildkite/x-pack/pipeline.xpack.packetbeat.yml
index 15254ff218e3..1ab71c30d7df 100644
--- a/.buildkite/x-pack/pipeline.xpack.packetbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.packetbeat.yml
@@ -31,8 +31,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -51,8 +50,7 @@ steps:
           mage systemTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -71,8 +69,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_RHEL9_X86_64}"
@@ -91,8 +88,7 @@ steps:
         key: "mandatory-win-2016-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2016}"
@@ -113,8 +109,7 @@ steps:
         key: "mandatory-win-2022-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2022}"
@@ -136,8 +131,7 @@ steps:
           mage systemTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2022}"
@@ -162,8 +156,7 @@ steps:
         key: "extended-win-10-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_10}"
@@ -184,8 +177,7 @@ steps:
         key: "extended-win-11-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_11}"
@@ -206,8 +198,7 @@ steps:
         key: "extended-win-2019-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2019}"
@@ -229,8 +220,7 @@ steps:
           mage systemTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_10}"
@@ -256,8 +246,7 @@ steps:
         if: build.env("GITHUB_PR_LABELS") =~ /.*arm.*/
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "aws"
           imagePrefix: "${IMAGE_UBUNTU_ARM_64}"
@@ -282,8 +271,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_X86_64}"
@@ -303,8 +291,7 @@ steps:
           mage build unitTest
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_ARM}"
diff --git a/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml b/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml
index 76c7ad30d87a..c6b5a6f59fe5 100644
--- a/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml
@@ -31,8 +31,7 @@ steps:
           MODULE: $MODULE
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2019}"
@@ -53,8 +52,7 @@ steps:
         key: "mandatory-win-2016-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2016}"
@@ -75,8 +73,7 @@ steps:
         key: "mandatory-win-2022-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2022}"
@@ -102,8 +99,7 @@ steps:
         key: "extended-win-10-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_10}"
@@ -124,8 +120,7 @@ steps:
         key: "extended-win-11-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_11}"
@@ -146,8 +141,7 @@ steps:
         key: "extended-win-2019-unit-tests"
         retry:
           automatic:
-            - exit_status: 1
-              limit: 3
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2019}"