diff --git a/.buildkite/auditbeat/auditbeat-pipeline.yml b/.buildkite/auditbeat/auditbeat-pipeline.yml index ff5f0e5ca84b..68f4591246c5 100644 --- a/.buildkite/auditbeat/auditbeat-pipeline.yml +++ b/.buildkite/auditbeat/auditbeat-pipeline.yml @@ -23,7 +23,7 @@ env: ASDF_MAGE_VERSION: 1.15.0 steps: - - group: "Auditbeat Mandatory Testing " + - group: "Auditbeat Mandatory Testing" key: "auditbeat-mandatory-tests" steps: @@ -109,11 +109,12 @@ steps: - group: "Auditbeat Extended Tests" key: "auditbeat-extended-tests" - if: build.env("BUILDKITE_PULL_REQUEST") == "false" + if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*(macOS|arm|integrations).*/ steps: - label: ":linux: Auditbeat Ubuntu Integration Tests" key: "auditbeat-extended-integ-tests" + if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*integrations.*/ command: | set -euo pipefail cd auditbeat @@ -131,7 +132,7 @@ steps: - label: ":linux: Auditbeat Linux ARM Integration Tests" key: "auditbeat-extended-arm64-integ-tests" - if: build.env("GITHUB_PR_LABELS") =~ /.*arm.*/ + if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*integrations.*/ command: | set -euo pipefail cd auditbeat @@ -149,7 +150,7 @@ steps: - label: ":linux: Auditbeat Linux ARM Unit Tests" key: "auditbeat-extended-arm64-unit-tests" - if: build.env("GITHUB_PR_LABELS") =~ /.*arm.*/ + if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/ command: | set -euo pipefail cd auditbeat @@ -166,7 +167,7 @@ steps: context: "auditbeat: Linux ARM Unit Tests" - label: ":mac: Auditbeat MacOS Unit Tests" - if: build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/ + if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/ command: | set -euo pipefail source .buildkite/scripts/install_macos_tools.sh @@ -182,8 +183,8 @@ steps: - github_commit_status: context: "auditbeat: MacOS Unit Tests" - - label: ":mac: Auditbeat macOS ARM Unit Tests" - if: build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/ + - label: ":mac: Auditbeat MacOS ARM Unit Tests" + if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/ command: | set -euo pipefail source .buildkite/scripts/install_macos_tools.sh