Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update filebeat pipeline to match Jenkins steps #39261

Merged
merged 7 commits into from
May 10, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 27 additions & 24 deletions .buildkite/filebeat/filebeat-pipeline.yml
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ steps:
- group: "Filebeat Mandatory Tests"
key: "filebeat-mandatory-tests"
steps:
- label: ":ubuntu: Ubuntu Unit Tests"
- label: ":ubuntu: Filebeat Unit Tests"
command: |
cd filebeat
mage build unitTest
@@ -42,9 +42,9 @@ steps:
- "filebeat/build/*.json"
notify:
- github_commit_status:
context: "filebeat: Ubuntu Unit Tests"
context: "filebeat: Linux x86_64 Unit Tests"

- label: ":ubuntu: Ubuntu Go Integration Tests"
- label: ":ubuntu: Filebeat Go Integration Tests"
command: |
cd filebeat
mage goIntegTest
@@ -60,9 +60,9 @@ steps:
- "filebeat/build/*.json"
notify:
- github_commit_status:
context: "filebeat: Ubuntu Go Integration Tests"
context: "filebeat: Filebeat Go Integration Tests"

- label: ":ubuntu: Ubuntu Python Integration Tests"
- label: ":ubuntu: Filebeat Python Integration Tests"
command: |
cd filebeat
mage pythonIntegTest
@@ -80,7 +80,7 @@ steps:
- github_commit_status:
context: "filebeat: Python Integration Tests"

- label: ":windows: Windows 2016 Unit Tests"
- label: ":windows: Filebeat Windows 2016 Unit Tests"
key: "windows-2016-unit-tests"
command: |
Set-Location -Path filebeat
@@ -101,7 +101,7 @@ steps:
- github_commit_status:
context: "filebeat: Windows 2016 Unit Tests"

- label: ":windows: Windows 2022 Unit Tests"
- label: ":windows: Filebeat Windows 2022 Unit Tests"
key: "windows-2022-unit-tests"
command: |
Set-Location -Path filebeat
@@ -124,8 +124,10 @@ steps:

- group: "Filebeat Extended Tests"
key: "filebeat-extended-tests"
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*(macOS|arm).*/

steps:
- label: ":mac: MacOS x64_64 Unit Tests"
- label: ":mac: Filebeat macOS x86_64 Unit Tests"
pierrehilbert marked this conversation as resolved.
Show resolved Hide resolved
key: "macos-unit-tests-extended"
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
command: |
@@ -144,9 +146,9 @@ steps:
- "filebeat/build/*.json"
notify:
- github_commit_status:
context: "filebeat: Extended MacOS Unit Tests"
context: "filebeat: macOS x86_64 Unit Tests"
pierrehilbert marked this conversation as resolved.
Show resolved Hide resolved

- label: ":mac: MacOS arm64 Unit Tests"
- label: ":mac: Filebeat macOS arm64 Unit Tests"
pierrehilbert marked this conversation as resolved.
Show resolved Hide resolved
key: "macos-arm64-unit-tests-extended"
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
command: |
@@ -165,9 +167,9 @@ steps:
- "filebeat/build/*.json"
notify:
- github_commit_status:
context: "filebeat: Extended MacOS ARM Unit Tests"
context: "filebeat: macOS arm64 Unit Tests"
pierrehilbert marked this conversation as resolved.
Show resolved Hide resolved

- label: ":linux: Ubuntu ARM Unit Tests"
- label: ":linux: Filebeat arm64 Unit Tests"
key: "extended-arm64-unit-test"
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/
command: |
@@ -185,13 +187,14 @@ steps:
- "filebeat/build/*.json"
notify:
- github_commit_status:
context: "filebeat: Extended Ubuntu ARM Unit Tests"
context: "filebeat: Linux arm64 Unit Tests"

- group: "Extended Windows Tests"
- group: "Filebeat Extended Windows Tests"
key: "filebeat-extended-win-tests"
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/

steps:
- label: ":windows: Windows 2019 Unit Tests"
- label: ":windows: Filebeat Windows 2019 Unit Tests"
key: "windows-extended-2019"
command: |
Set-Location -Path filebeat
@@ -210,9 +213,9 @@ steps:
- "filebeat/build/*.json"
notify:
- github_commit_status:
context: "filebeat: Extended Windows 2019 Unit Tests"
context: "filebeat: Windows 2019 Unit Tests"

- label: ":windows: Windows 11 Unit Tests"
- label: ":windows: Filebeat Windows 11 Unit Tests"
key: "windows-extended-11"
command: |
Set-Location -Path filebeat
@@ -231,9 +234,9 @@ steps:
- "filebeat/build/*.json"
notify:
- github_commit_status:
context: "filebeat: Extended Windows 11 Unit Tests"
context: "filebeat: Windows 11 Unit Tests"

- label: ":windows: Windows 10 Unit Tests"
- label: ":windows: Filebeat Windows 10 Unit Tests"
key: "windows-extended-10"
command: |
Set-Location -Path filebeat
@@ -252,7 +255,7 @@ steps:
- "filebeat/build/*.json"
notify:
- github_commit_status:
context: "filebeat: Extended Windows 10 Unit Tests"
context: "filebeat: Windows 10 Unit Tests"

- wait: ~
# with PRs, we want to run packaging only if mandatory tests succeed
@@ -264,7 +267,7 @@ steps:
- group: "Filebeat Packaging"
key: "packaging"
steps:
- label: ":linux: Packaging Linux"
- label: ":linux: Filebeat Packaging Linux"
key: "packaging-linux"
command: |
cd filebeat
@@ -283,9 +286,9 @@ steps:
PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
notify:
- github_commit_status:
context: "filebeat: Packaging"
context: "filebeat: Packaging Linux"

- label: ":linux: Packaging ARM"
- label: ":linux: Filebeat Packaging arm64"
key: "packaging-arm"
command: |
cd filebeat
@@ -303,4 +306,4 @@ steps:
PACKAGES: "docker"
notify:
- github_commit_status:
context: "filebeat: Packaging ARM"
context: "filebeat: Packaging arm64"
2 changes: 1 addition & 1 deletion .buildkite/hooks/pre-command
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ PRIVATE_CI_GCS_CREDENTIALS_PATH="kv/ci-shared/platform-ingest/gcp-platform-inges
DOCKER_REGISTRY_SECRET_PATH="kv/ci-shared/platform-ingest/docker_registry_prod"
GITHUB_TOKEN_VAULT_PATH="kv/ci-shared/platform-ingest/github_token"

if [[ "$BUILDKITE_PIPELINE_SLUG" == "beats" || "$BUILDKITE_PIPELINE_SLUG" == "filebeat" ]]; then
if [[ "$BUILDKITE_PIPELINE_SLUG" == "beats" ]]; then
source .buildkite/env-scripts/env.sh
if [[ -z "${GO_VERSION-""}" ]]; then
export GO_VERSION=$(cat "${WORKSPACE}/.go-version")