Use beets VM images for filebeat

elastic · Mar 14, 2024 · ab9eecb · ab9eecb
1 parent 3449137
commit ab9eecb
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/.buildkite/filebeat/scripts/crosscompile.sh b/.buildkite/filebeat/scripts/crosscompile.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+source .buildkite/env-scripts/linux-env.sh
+
+echo "--- Executing Crosscompile"
+make -C filebeat crosscompile
diff --git a/filebeat/buildkite.yml b/filebeat/buildkite.yml
@@ -12,25 +12,25 @@ stages:
     mandatory:
         # NOTE: stage name should be unique!
         unitTest:
-            command: "mage -d filebeat build unitTest"
+            command: ".buildkite/filebeat/scripts/unit-tests.sh"
             platform: "family/platform-ingest-beats-ubuntu-2204"
         crosscompile:
-            command: "make -C filebeat crosscompile"
+            command: ".buildkite/filebeat/scripts/crosscompile.sh"
             platform: "family/platform-ingest-beats-ubuntu-2204"
         goIntegTest:
-            command: "mage -d filebeat goIntegTest"
+            command: ".buildkite/filebeat/scripts/integration-gotests.sh"
             platform: "family/platform-ingest-beats-ubuntu-2204"
         pythonIntegTest:
-            command: "mage -d filebeat pythonIntegTest"
+            command: ".buildkite/filebeat/scripts/integration-pytests.sh"
             platform: "family/platform-ingest-beats-ubuntu-2204"
         rhel-9:
-            command: "mage -d filebeat build unitTest"
+            command: ".buildkite/filebeat/scripts/unit-tests.sh"
             platform: "family/platform-ingest-beats-rhel-9"
         unitTest-windows-2022:
-            command: "mage -d filebeat build unitTest"
+            command: ".buildkite/filebeat/scripts/unit-tests-win.ps1"
             platform: "family/platform-ingest-beats-windows-2022"
         unitTest-windows-2016:
-            command: "mage -d filebeat build unitTest"
+            command: ".buildkite/filebeat/scripts/unit-tests-win.ps1"
             platform: "family/platform-ingest-beats-windows-2016"
     # optional stage - it runs on:
     #   - branches/tags
@@ -39,11 +39,11 @@ stages:
     #       - GitHub label <sub-stage-name> . i.e: integTest or unitTest-arm or unitTest-macos ...
     extended:
         unitTest-arm:
-            command: "mage build unitTest"
+            command: ".buildkite/filebeat/scripts/unit-tests.sh"
             platform: "core-ubuntu-2004-aarch64"
         unitTest-macos:
-            command: "mage build unitTest"
+            command: ".buildkite/filebeat/scripts/unit-tests.sh"
             platform: "generic-13-ventura-x64"
         unitTest-windows-2019:
-            command: "mage build unitTest"
-            platform: "family/core-windows-2019"
+            command: ".buildkite/filebeat/scripts/unit-tests-win.ps1"
+            platform: "family/platform-ingest-beats-windows-2019"