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.

Sign up for GitHub

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

Jump to bottom

Postmigration naming fixes 7.17 #40051

Open
wants to merge 9 commits into
base: 7.17
Choose a base branch
from
+288 −281
Open

Postmigration naming fixes 7.17 #40051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3e8e08f
updated pipeline
oakrizan May 27, 2024
f485a65
replaced deprecated no-ansi opt
oakrizan Jun 3, 2024
095d090
docker-compose problem debugging
oakrizan Jun 4, 2024
d68d264
restored libbeat/tests/compose/wrapper.go
oakrizan Jun 12, 2024
e778e77
updated region
oakrizan Jun 12, 2024
fe601fa
updated region for x-pack/filebeat
oakrizan Jun 13, 2024
40a108f
removed repo env var and commented TEST_TAGS
oakrizan Jun 21, 2024
cb06660
moved test tags var to pipleine
oakrizan Jun 26, 2024
ddfed84
updated namings
oakrizan Jun 28, 2024
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
45 changes: 23 additions & 22 deletions .buildkite/auditbeat/auditbeat-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ env:
TEST_COVERAGE: "true"

steps:
- group: "Auditbeat Check/Update"
- group: "Check/Update"
key: "auditbeat-check-update"

steps:
- label: "Run check/update"
- label: "Auditbeat: Run check/update"
command: |
set -eo pipefail
make -C auditbeat check update
Expand All @@ -47,19 +47,19 @@ steps:
notify:
- github_commit_status:
context: "auditbeat: check/update"

- wait: ~
# with PRs, we want to run mandatory tests only if check/update step succeed
# for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests
# this allows building DRA artifacts even if there is flakiness in check/update step
if: build.env("BUILDKITE_PULL_REQUEST") != "false"
depends_on: "auditbeat-check-update"

- group: "Auditbeat Mandatory Testing"
- group: "Mandatory Testing"
key: "auditbeat-mandatory-tests"

steps:
- label: ":linux: Auditbeat Ubuntu arm64 Unit Tests"
- label: ":ubuntu: Auditbeat: Ubuntu arm64 Unit Tests"
key: "auditbeat-extended-arm64-unit-tests"
command: |
cd auditbeat
Expand All @@ -76,9 +76,9 @@ steps:
- "auditbeat/build/*.json"
notify:
- github_commit_status:
context: "auditbeat: Linux arm64 Unit Tests"
context: "auditbeat: Ubuntu arm64 Unit Tests"

- label: ":ubuntu: Auditbeat Unit Tests"
- label: ":ubuntu: Auditbeat: Ubuntu x86_64 Unit Tests"
command: |
cd auditbeat
mage build unitTest
Expand All @@ -94,9 +94,9 @@ steps:
- "auditbeat/build/*.json"
notify:
- github_commit_status:
context: "auditbeat: Ubuntu Unit Tests"
context: "auditbeat: Ubuntu x86_64 Unit Tests"

- label: "Module compat tests: next major"
- label: ":ubuntu: Auditbeat: Module compat tests: next major"
# Run module integration tests under next major of Elastic stack.
env:
STACK_ENVIRONMENT: "next-major"
Expand All @@ -121,7 +121,7 @@ steps:
- github_commit_status:
context: "auditbeat: Module compat tests / next major"

- label: ":linux: Auditbeat Crosscompile"
- label: ":ubuntu: Auditbeat: Crosscompile"
command: |
make -C auditbeat crosscompile
env:
Expand All @@ -137,7 +137,7 @@ steps:
- github_commit_status:
context: "auditbeat: Crosscompile"

- label: ":windows: Auditbeat Win-2019 Unit Tests"
- label: ":windows: Auditbeat: Win 2019 Unit Tests"
command: |
Set-Location -Path auditbeat
mage build unitTest
Expand All @@ -155,14 +155,14 @@ steps:
- "auditbeat/build/*.json"
notify:
- github_commit_status:
context: "auditbeat: Windows 2019 Unit Tests"
context: "auditbeat: Win 2019 Unit Tests"

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

steps:
- label: ":mac: Auditbeat macOS x86_64 Unit Tests"
- label: ":mac: Auditbeat: macOS x86_64 Unit Tests"
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
command: |
set -euo pipefail
Expand All @@ -182,12 +182,12 @@ steps:
- github_commit_status:
context: "auditbeat: macOS x86_64 Unit Tests"

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

steps:
- label: ":windows: Auditbeat Win-2016 Unit Tests"
- label: ":windows: Auditbeat: Win 2016 Unit Tests"
key: "auditbeat-extended-win-2016-unit-tests"
command: |
Set-Location -Path auditbeat
Expand All @@ -206,9 +206,9 @@ steps:
- "auditbeat/build/*.json"
notify:
- github_commit_status:
context: "auditbeat: Extended Windows 2019 Unit Tests"
context: "auditbeat: Extended Win 2019 Unit Tests"

- label: ":windows: Auditbeat Win-10 Unit Tests"
- label: ":windows: Auditbeat: Win 10 Unit Tests"
key: "auditbeat-extended-win-10-unit-tests"
command: |
Set-Location -Path auditbeat
Expand All @@ -227,7 +227,7 @@ steps:
- "auditbeat/build/*.json"
notify:
- github_commit_status:
context: "auditbeat: Extended Windows 10 Unit Tests"
context: "auditbeat: Extended Win 10 Unit Tests"

- wait: ~
# with PRs, we want to run packaging only if mandatory tests succeed
Expand All @@ -236,10 +236,11 @@ steps:
if: build.env("BUILDKITE_PULL_REQUEST") != "false"
depends_on: "auditbeat-mandatory-tests"

- group: "Auditbeat Packaging"
- group: "Packaging"
key: "auditbeat-packaging"

steps:
- label: ":ubuntu: Auditbeat/Packaging Linux"
- label: ":ubuntu: Auditbeat: Packaging Linux"
key: "auditbeat-package-linux-x86"
env:
PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
Expand All @@ -259,7 +260,7 @@ steps:
- github_commit_status:
context: "auditbeat: Packaging Linux"

- label: ":linux: Auditbeat/Packaging Linux arm64"
- label: ":linux: Auditbeat: Packaging Linux arm64"
key: "auditbeat-package-linux-arm64"
env:
PLATFORMS: "linux/arm64"
Expand Down
55 changes: 28 additions & 27 deletions .buildkite/filebeat/filebeat-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ env:
TEST_COVERAGE: "true"

steps:
- group: "Filebeat Check/Update"
- group: "Check/Update"
key: "filebeat-check-update"
steps:
- label: "Run check/update"
- label: "Filebeat: Run check/update"
command: |
set -eo pipefail
make -C filebeat check update
Expand All @@ -43,18 +43,19 @@ steps:
notify:
- github_commit_status:
context: "filebeat: check/update"

- wait: ~
# with PRs, we want to run mandatory tests only if check/update step succeed
# for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests
# this allows building DRA artifacts even if there is flakiness in check/update step
if: build.env("BUILDKITE_PULL_REQUEST") != "false"
depends_on: "filebeat-check-update"

- group: "Filebeat Mandatory Tests"
- group: "Mandatory Tests"
key: "filebeat-mandatory-tests"

steps:
- label: ":ubuntu: Filebeat Unit Tests"
- label: ":ubuntu: Filebeat: Ubuntu x86_64 Unit Tests"
command: |
cd filebeat
mage build unitTest
Expand All @@ -70,9 +71,9 @@ steps:
- "filebeat/build/*.json"
notify:
- github_commit_status:
context: "filebeat: Linux x86_64 Unit Tests"
context: "filebeat: Ubuntu x86_64 Unit Tests"

- label: ":linux: Filebeat arm64 Unit Tests"
- label: ":ubuntu: Filebeat: Ubuntu arm64 Unit Tests"
command: |
cd filebeat
mage build unitTest
Expand All @@ -88,9 +89,9 @@ steps:
- "filebeat/build/*.json"
notify:
- github_commit_status:
context: "filebeat: Linux arm64 Unit Tests"
context: "filebeat: Ubuntu arm64 Unit Tests"

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

- label: ":ubuntu: Filebeat Python Integration Tests"
- label: ":ubuntu: Filebeat: Python Integration Tests"
command: |
cd filebeat
mage pythonIntegTest
Expand All @@ -124,9 +125,9 @@ steps:
- "filebeat/build/*.json"
notify:
- github_commit_status:
context: "filebeat: Python Integration Tests"
context: "filebeat: Python: Integration Tests"

- label: "Module compat tests: previous minor"
- label: ":ubuntu: Filebeat: Module compat tests: previous minor"
# Runs module integration tests under previous minor of ES to ensure ingest pipeline compatibility
env:
STACK_ENVIRONMENT: "prev-minor"
Expand All @@ -151,9 +152,9 @@ steps:
- "filebeat/build/*.json"
notify:
- github_commit_status:
context: "filebeat: Module compat tests / previous minor"
context: "filebeat: Module compat tests: previous minor"

- label: "Module compat tests: next major"
- label: ":ubuntu: Filebeat: Module compat tests: next major"
# Run module integration tests under next major of Elastic stack.
env:
STACK_ENVIRONMENT: "next-major"
Expand All @@ -177,9 +178,9 @@ steps:
- "filebeat/build/*.json"
notify:
- github_commit_status:
context: "filebeat: Module compat tests / next major"
context: "filebeat: Module compat tests: next major"

- label: ":windows: Filebeat Windows 2019 Unit Tests"
- label: ":windows: Filebeat: Win 2019 Unit Tests"
key: "windows-extended-2019"
command: |
Set-Location -Path filebeat
Expand All @@ -198,13 +199,13 @@ steps:
- "filebeat/build/*.json"
notify:
- github_commit_status:
context: "filebeat: Windows 2019 Unit Tests"
context: "filebeat: Win 2019 Unit Tests"

- group: "Filebeat Extended Tests"
- group: "Extended Tests"
key: "filebeat-extended-tests"

steps:
- label: ":mac: MacOS x64_64 Unit Tests"
- label: ":mac: Filebeat: macOS x64_64 Unit Tests"
key: "macos-unit-tests-extended"
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
command: |
Expand All @@ -230,7 +231,7 @@ steps:
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/

steps:
- label: ":windows: Filebeat Windows 2016 Unit Tests"
- label: ":windows: Filebeat: Win 2016 Unit Tests"
key: "windows-2016-unit-tests"
command: |
Set-Location -Path filebeat
Expand All @@ -249,9 +250,9 @@ steps:
- "filebeat/build/*.json"
notify:
- github_commit_status:
context: "filebeat: Windows 2016 Unit Tests"
context: "filebeat: Win 2016 Unit Tests"

- label: ":windows: Filebeat Windows 10 Unit Tests"
- label: ":windows: Filebeat: Win 10 Unit Tests"
key: "windows-extended-10"
command: |
Set-Location -Path filebeat
Expand All @@ -270,7 +271,7 @@ steps:
- "filebeat/build/*.json"
notify:
- github_commit_status:
context: "filebeat: Windows 10 Unit Tests"
context: "filebeat: Win 10 Unit Tests"

- wait: ~
# with PRs, we want to run packaging only if mandatory tests succeed
Expand All @@ -279,10 +280,10 @@ steps:
if: build.env("BUILDKITE_PULL_REQUEST") != "false"
depends_on: "filebeat-mandatory-tests"

- group: "Filebeat Packaging"
- group: "Packaging"
key: "packaging"
steps:
- label: ":linux: Filebeat Packaging Linux"
- label: ":ubuntu: Filebeat: Packaging Linux"
key: "packaging-linux"
command: |
cd filebeat
Expand All @@ -303,7 +304,7 @@ steps:
- github_commit_status:
context: "filebeat: Packaging Linux"

- label: ":linux: Filebeat Packaging arm64"
- label: ":ubuntu: Filebeat: Packaging arm64"
key: "packaging-arm"
command: |
cd filebeat
Expand Down
Loading
Loading