Revert "Enabling retries for Beats flaky tests (elastic#39174)"

This reverts commit e985f41.
oakrizan · May 2, 2024 · 7897953 · 7897953
1 parent e985f41
commit 7897953
Show file tree

Hide file tree

Showing 16 changed files with 1 addition and 447 deletions.
diff --git a/.buildkite/auditbeat/auditbeat-pipeline.yml b/.buildkite/auditbeat/auditbeat-pipeline.yml
@@ -32,9 +32,6 @@ steps:
           set -euo pipefail
           cd auditbeat
           mage build unitTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -51,9 +48,6 @@ steps:
           set -euo pipefail
           cd auditbeat
           mage build unitTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_RHEL9}"
@@ -69,9 +63,6 @@ steps:
         command: |
           Set-Location -Path auditbeat
           mage build unitTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2016}"
@@ -89,9 +80,6 @@ steps:
         command: |
           Set-Location -Path auditbeat
           mage build unitTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2022}"
@@ -110,9 +98,6 @@ steps:
           make -C auditbeat crosscompile
         env:
           GOX_FLAGS: "-arch amd64"
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -151,9 +136,6 @@ steps:
           set -euo pipefail
           cd auditbeat
           mage build integTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "aws"
           imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
@@ -189,14 +171,7 @@ steps:
           set -euo pipefail
           source .buildkite/scripts/install_macos_tools.sh
           cd auditbeat
-<<<<<<< HEAD
           mage build unitTest
-=======
-          mage unitTest
-        retry:
-          automatic:
-           - limit: 3
->>>>>>> 02ea29d8cf (Enabling retries for Beats flaky tests (#39174))
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_X86_64}"
@@ -213,14 +188,7 @@ steps:
           set -euo pipefail
           source .buildkite/scripts/install_macos_tools.sh
           cd auditbeat
-<<<<<<< HEAD
           mage build unitTest
-=======
-          mage unitTest
-        retry:
-          automatic:
-           - limit: 3
->>>>>>> 02ea29d8cf (Enabling retries for Beats flaky tests (#39174))
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_ARM}"
@@ -241,9 +209,6 @@ steps:
         command: |
           Set-Location -Path auditbeat
           mage build unitTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2019}"
@@ -262,9 +227,6 @@ steps:
         command: |
           Set-Location -Path auditbeat
           mage build unitTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_10}"
@@ -283,9 +245,6 @@ steps:
         command: |
           Set-Location -Path auditbeat
           mage build unitTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_11}"

diff --git a/.buildkite/filebeat/filebeat-pipeline.yml b/.buildkite/filebeat/filebeat-pipeline.yml
@@ -30,9 +30,6 @@ steps:
         command: |
           cd filebeat
           mage build unitTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -48,9 +45,6 @@ steps:
         command: |
           cd filebeat
           mage goIntegTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -66,9 +60,6 @@ steps:
         command: |
           cd filebeat
           mage pythonIntegTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: gcp
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -85,9 +76,6 @@ steps:
         command: |
           Set-Location -Path filebeat
           mage build unitTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2016}"
@@ -106,9 +94,6 @@ steps:
         command: |
           Set-Location -Path filebeat
           mage build unitTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2022}"
@@ -133,9 +118,6 @@ steps:
           source .buildkite/scripts/install_macos_tools.sh
           cd filebeat
           mage build unitTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_X86_64}"
@@ -154,9 +136,6 @@ steps:
           source .buildkite/scripts/install_macos_tools.sh
           cd filebeat
           mage build unitTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_ARM}"
@@ -173,9 +152,6 @@ steps:
         command: |
           cd filebeat
           mage build unitTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "aws"
           imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
@@ -196,9 +172,6 @@ steps:
         command: |
           Set-Location -Path filebeat
           mage build unitTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2019}"
@@ -217,9 +190,6 @@ steps:
         command: |
           Set-Location -Path filebeat
           mage build unitTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_11}"
@@ -238,9 +208,6 @@ steps:
         command: |
           Set-Location -Path filebeat
           mage build unitTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_10}"

diff --git a/.buildkite/heartbeat/heartbeat-pipeline.yml b/.buildkite/heartbeat/heartbeat-pipeline.yml
@@ -30,9 +30,6 @@ steps:
         command: |
           cd heartbeat
           mage build unitTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -48,9 +45,6 @@ steps:
         command: |
           cd heartbeat
           mage build unitTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_RHEL9}"
@@ -67,9 +61,6 @@ steps:
         command: |
           Set-Location -Path heartbeat
           mage build unitTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2016}"
@@ -87,9 +78,6 @@ steps:
         command: |
           Set-Location -Path heartbeat
           mage build unitTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2022}"
@@ -106,9 +94,6 @@ steps:
         command:  |
           cd heartbeat
           mage goIntegTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -124,9 +109,6 @@ steps:
         command: |
           cd heartbeat
           mage pythonIntegTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -148,9 +130,6 @@ steps:
         command: |
           cd heartbeat
           mage build unitTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "aws"
           imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
@@ -172,9 +151,6 @@ steps:
           source .buildkite/scripts/install_macos_tools.sh
           cd heartbeat
           mage build unitTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_X86_64}"
@@ -192,9 +168,6 @@ steps:
           source .buildkite/scripts/install_macos_tools.sh
           cd heartbeat
           mage build unitTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_ARM}"
@@ -215,9 +188,6 @@ steps:
         command:  |
           Set-Location -Path heartbeat
           mage build unitTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2019}"
@@ -235,9 +205,6 @@ steps:
         command: |
           Set-Location -Path heartbeat
           mage build unitTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_11}"
@@ -255,9 +222,6 @@ steps:
         command: |
           Set-Location -Path heartbeat
           mage build unitTest
-        retry:
-          automatic:
-           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_10}"