Skip to content

Commit

Permalink
[8.13](backport #39261) Update filebeat pipeline to match Jenkins ste…
Browse files Browse the repository at this point in the history
…ps (#39509)

updated filebeat pipeline to match same steps & commands as in Jenkins
  • Loading branch information
mergify[bot] committed May 15, 2024
1 parent 52f0a8b commit b4792d3
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 25 deletions.
51 changes: 27 additions & 24 deletions .buildkite/filebeat/filebeat-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,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
Expand All @@ -46,9 +46,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
Expand All @@ -64,9 +64,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
Expand All @@ -84,7 +84,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
Expand All @@ -105,7 +105,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
Expand All @@ -128,8 +128,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"
key: "macos-unit-tests-extended"
if: build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
command: |
Expand All @@ -148,9 +150,9 @@ steps:
- "filebeat/build/*.json"
notify:
- github_commit_status:
context: "filebeat: Extended MacOS Unit Tests"
context: "filebeat: macOS x86_64 Unit Tests"

- label: ":mac: MacOS arm64 Unit Tests"
- label: ":mac: Filebeat macOS arm64 Unit Tests"
key: "macos-arm64-unit-tests-extended"
if: build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
command: |
Expand All @@ -169,9 +171,9 @@ steps:
- "filebeat/build/*.json"
notify:
- github_commit_status:
context: "filebeat: Extended MacOS ARM Unit Tests"
context: "filebeat: macOS arm64 Unit Tests"

- 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: |
Expand All @@ -189,13 +191,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
Expand All @@ -214,9 +217,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
Expand All @@ -235,9 +238,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
Expand All @@ -256,7 +259,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
Expand All @@ -268,7 +271,7 @@ steps:
- group: "Filebeat Packaging"
key: "packaging"
steps:
- label: ":linux: Packaging Linux"
- label: ":linux: Filebeat Packaging Linux"
key: "packaging-linux"
command: |
cd filebeat
Expand All @@ -287,9 +290,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
Expand All @@ -307,4 +310,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
Expand Up @@ -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")
Expand Down

0 comments on commit b4792d3

Please sign in to comment.