fix conflicts

elastic · May 2, 2024 · 9e713ad · 9e713ad
1 parent 38ba5fc
commit 9e713ad
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/.buildkite/auditbeat/auditbeat-pipeline.yml b/.buildkite/auditbeat/auditbeat-pipeline.yml
@@ -132,8 +132,10 @@ steps:
         command: |
           set -euo pipefail
           cd auditbeat
-<<<<<<< HEAD
           mage build integTest
+        retry:
+          automatic:
+           - limit: 3
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -152,12 +154,9 @@ steps:
           set -euo pipefail
           cd auditbeat
           mage build integTest
-=======
-          mage unitTest
         retry:
           automatic:
            - limit: 3
->>>>>>> main
         agents:
           provider: "aws"
           imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
@@ -176,6 +175,9 @@ steps:
           set -euo pipefail
           cd auditbeat
           mage build unitTest
+        retry:
+          automatic:
+           - limit: 3
         agents:
           provider: "aws"
           imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
@@ -193,14 +195,10 @@ steps:
           set -euo pipefail
           source .buildkite/scripts/install_macos_tools.sh
           cd auditbeat
-<<<<<<< HEAD
           mage build unitTest
-=======
-          mage unitTest
         retry:
           automatic:
            - limit: 3
->>>>>>> main
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_X86_64}"
@@ -217,14 +215,10 @@ steps:
           set -euo pipefail
           source .buildkite/scripts/install_macos_tools.sh
           cd auditbeat
-<<<<<<< HEAD
           mage build unitTest
-=======
-          mage unitTest
         retry:
           automatic:
            - limit: 3
->>>>>>> main
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_ARM}"