updated step commands

elastic · Mar 26, 2024 · 8ed0717 · 8ed0717
1 parent 0bcac27
commit 8ed0717
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 48 deletions.
diff --git a/.buildkite/auditbeat/auditbeat-pipeline.yml b/.buildkite/auditbeat/auditbeat-pipeline.yml
@@ -24,7 +24,7 @@ steps:
 
     steps:
       - label: ":ubuntu: Unit Tests"
-        command: mage -d "${BEATS_PROJECT_NAME}" unitTest
+        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
         notify:
           - github_commit_status:
               context: "Auditbeat: linux/Unit Tests"
@@ -37,7 +37,7 @@ steps:
           - "auditbeat/build/*.json"
 
       - label: ":rhel: Unit Tests"
-        command: mage -d "${BEATS_PROJECT_NAME}" unitTest
+        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
         notify:
           - github_commit_status:
               context: "Auditbeat: rhel/Unit Tests"
@@ -83,7 +83,7 @@ steps:
 
       - label: ":linux: Crosscompile"
         command:
-          - ".buildkite/auditbeat/scripts/crosscompile.sh"
+          - "make -C auditbeat crosscompile"
         env:
           GOX_FLAGS: "-arch amd64"
         notify:
@@ -102,7 +102,7 @@ steps:
       - label: ":linux: ARM64 Unit Tests"
         key: "arm-extended"
         if: build.env("GITHUB_PR_TRIGGER_COMMENT") == "auditbeat for arm" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/
-        command: mage -d "${BEATS_PROJECT_NAME}" unitTest
+        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
         notify:
           - github_commit_status:
               context: "Auditbeat: Unit Tests ARM"
@@ -115,7 +115,7 @@ steps:
       - label: ":mac: MacOS Unit Tests"
         key: "macos-extended"
         if: build.env("GITHUB_PR_TRIGGER_COMMENT") == "auditbeat for macos" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
-        command: mage -d "${BEATS_PROJECT_NAME}" unitTest
+        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
         notify:
           - github_commit_status:
               context: "Auditbeat: MacOS Unit Tests"

diff --git a/.buildkite/filebeat/filebeat-pipeline.yml b/.buildkite/filebeat/filebeat-pipeline.yml
@@ -23,8 +23,7 @@ steps:
 
     steps:
       - label: ":ubuntu: Unit Tests"
-        command:
-          - ".buildkite/filebeat/scripts/unit-tests.sh"
+        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
         notify:
           - github_commit_status:
               context: "Filebeat: linux/Unit Tests"
@@ -38,7 +37,10 @@ steps:
 
       - label: ":ubuntu: Go Integration Tests"
         command:
-          - ".buildkite/filebeat/scripts/integration-gotests.sh"
+#          - ".buildkite/filebeat/scripts/integration-gotests.sh"
+          - "sudo chmod -R go-w ${BEATS_PROJECT_NAME}"
+          - "umask 0022"
+          - "mage -d ${BEATS_PROJECT_NAME} goIntegTest"
         notify:
           - github_commit_status:
               context: "Filebeat: Go Integration Tests"
@@ -52,7 +54,8 @@ steps:
 
       - label: ":ubuntu: Python Integration Tests"
         command:
-          - ".buildkite/filebeat/scripts/integration-pytests.sh"
+          - "mage -d ${BEATS_PROJECT_NAME} pythonIntegTest"
+#          - ".buildkite/filebeat/scripts/integration-pytests.sh"
         notify:
           - github_commit_status:
               context: "Filebeat: Python Integration Tests"
@@ -104,8 +107,7 @@ steps:
       - label: ":linux: ARM64 Unit Tests"
         key: "arm-extended"
         if: build.env("GITHUB_PR_TRIGGER_COMMENT") == "filebeat for arm" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/
-        command:
-          - ".buildkite/filebeat/scripts/unit-tests.sh"
+        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
         notify:
           - github_commit_status:
               context: "Filebeat: Unit Tests ARM"
@@ -118,8 +120,7 @@ steps:
       - label: ":mac: MacOS Unit Tests"
         key: "macos-extended"
         if: build.env("GITHUB_PR_TRIGGER_COMMENT") == "filebeat for macos" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
-        command:
-          - ".buildkite/filebeat/scripts/unit-tests.sh"
+        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
         notify:
           - github_commit_status:
               context: "Filebeat: MacOS Unit Tests"
@@ -131,8 +132,7 @@ steps:
       - label: ":mac: MacOS ARM Unit Tests"
         key: "macos-extended-arm"
         if: build.env("GITHUB_PR_TRIGGER_COMMENT") == "filebeat for macos" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
-        command:
-          - ".buildkite/filebeat/scripts/unit-tests.sh"
+        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
         notify:
           - github_commit_status:
               context: "Filebeat: MacOS ARM Unit Tests"

diff --git a/.buildkite/heartbeat/heartbeat-pipeline.yml b/.buildkite/heartbeat/heartbeat-pipeline.yml
@@ -24,8 +24,7 @@ steps:
 
     steps:
       - label: ":ubuntu: Unit Tests"
-        command:
-          - ".buildkite/heartbeat/scripts/unit-tests.sh"
+        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
         notify:
           - github_commit_status:
               context: "Heartbeat: ubuntu/Unit Tests"
@@ -38,8 +37,7 @@ steps:
           - "heartbeat/build/*.json"
 
       - label: ":rhel:-9 Unit Tests"
-        command:
-          - ".buildkite/heartbeat/scripts/unit-tests.sh"
+        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
         notify:
           - github_commit_status:
               context: "Heartbeat: rhel-9/Unit Tests"
@@ -83,7 +81,8 @@ steps:
 
       - label: ":ubuntu: Go Integration Tests"
         command:
-          - ".buildkite/heartbeat/scripts/integration-gotests.sh"
+          - "mage -d ${BEATS_PROJECT_NAME} goIntegTest"
+#          - ".buildkite/heartbeat/scripts/integration-gotests.sh"
         notify:
           - github_commit_status:
               context: "Heartbeat: Go Integration Tests"
@@ -97,7 +96,8 @@ steps:
 
       - label: ":ubuntu: Python Integration Tests"
         command:
-          - ".buildkite/heartbeat/scripts/integration-pytests.sh"
+          - "mage -d ${BEATS_PROJECT_NAME} pythonIntegTest"
+#          - ".buildkite/heartbeat/scripts/integration-pytests.sh"
         notify:
           - github_commit_status:
               context: "Heartbeat: Python Integration Tests"
@@ -117,8 +117,7 @@ steps:
       - label: ":linux: ARM64 Unit Tests"
         key: "arm-extended"
         if: build.env("GITHUB_PR_TRIGGER_COMMENT") == "heartbeat for arm" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/
-        command:
-          - ".buildkite/heartbeat/scripts/unit-tests.sh"
+        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
         notify:
           - github_commit_status:
               context: "Heartbeat: Unit Tests ARM"
@@ -131,8 +130,7 @@ steps:
       - label: ":mac: MacOS Unit Tests"
         key: "macos-extended"
         if: build.env("GITHUB_PR_TRIGGER_COMMENT") == "heartbeat for macos" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
-        command:
-          - ".buildkite/heartbeat/scripts/unit-tests.sh"
+        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
         notify:
           - github_commit_status:
               context: "Heartbeat: MacOS Unit Tests"
@@ -144,8 +142,7 @@ steps:
       - label: ":mac: MacOS ARM Unit Tests"
         key: "macos-extended-arm"
         if: build.env("GITHUB_PR_TRIGGER_COMMENT") == "heartbeat for macos" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
-        command:
-          - ".buildkite/heartbeat/scripts/unit-tests.sh"
+        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
         notify:
           - github_commit_status:
               context: "Heartbeat: MacOS ARM Unit Tests"

diff --git a/.buildkite/scripts/win-tests.ps1 b/.buildkite/scripts/win-tests.ps1