Skip to content

Commit

Permalink
Merge branch 'main' into bump/mongodb
Browse files Browse the repository at this point in the history
  • Loading branch information
@kruskall
kruskall authored Dec 29, 2024
2 parents 0e74b33 + ee6378c commit 509c814
Show file tree
Hide file tree
Showing 994 changed files with 44,036 additions and 45,922 deletions.
121 changes: 110 additions & 11 deletions .buildkite/auditbeat/auditbeat-pipeline.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: "beats-auditbeat"

env:
AWS_ARM_INSTANCE_TYPE: "m6g.xlarge"
AWS_IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2204-aarch64"

GCP_DEFAULT_MACHINE_TYPE: "c2d-highcpu-8"
GCP_HI_PERF_MACHINE_TYPE: "c2d-highcpu-16"
Expand All @@ -12,7 +11,12 @@ env:
IMAGE_MACOS_ARM: "generic-13-ventura-arm"
IMAGE_MACOS_X86_64: "generic-13-ventura-x64"
IMAGE_RHEL9: "family/platform-ingest-beats-rhel-9"
IMAGE_UBUNTU_X86_64: "family/platform-ingest-beats-ubuntu-2204"
IMAGE_UBUNTU_2004_X86_64: "family/platform-ingest-beats-ubuntu-2004"
IMAGE_UBUNTU_2004_ARM64: "platform-ingest-beats-ubuntu-2004-aarch64"
IMAGE_UBUNTU_2204_X86_64: "family/platform-ingest-beats-ubuntu-2204"
IMAGE_UBUNTU_2204_ARM64: "platform-ingest-beats-ubuntu-2204-aarch64"
IMAGE_UBUNTU_2404_X86_64: "family/platform-ingest-beats-ubuntu-2404"
IMAGE_UBUNTU_2404_ARM64: "platform-ingest-beats-ubuntu-2404-aarch64"
IMAGE_WIN_10: "family/platform-ingest-beats-windows-10"
IMAGE_WIN_11: "family/platform-ingest-beats-windows-11"
IMAGE_WIN_2016: "family/platform-ingest-beats-windows-2016"
Expand All @@ -28,6 +32,11 @@ env:
RACE_DETECTOR: "true"
TEST_COVERAGE: "true"

# Concurrency definition
CONCURRENCY_GROUP: "orka-concurrency-group"
CONCURRENCY_COUNT: 10
CONCURRENCY_METHOD: eager

steps:
- group: "Check/Update"
key: "auditbeat-check-update"
Expand Down Expand Up @@ -81,11 +90,17 @@ steps:
- limit: 1
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
image: "${IMAGE_UBUNTU_2204_X86_64}"
machineType: "${GCP_DEFAULT_MACHINE_TYPE}"
artifact_paths:
- "auditbeat/build/*.xml"
- "auditbeat/build/*.json"
plugins:
- test-collector#v1.10.2:
files: "auditbeat/build/TEST-*.xml"
format: "junit"
branches: "main"
debug: true
notify:
- github_commit_status:
context: "auditbeat: Ubuntu x86_64 Unit Tests"
Expand All @@ -105,6 +120,12 @@ steps:
artifact_paths:
- "auditbeat/build/*.xml"
- "auditbeat/build/*.json"
plugins:
- test-collector#v1.10.2:
files: "auditbeat/build/TEST-*.xml"
format: "junit"
branches: "main"
debug: true
notify:
- github_commit_status:
context: "auditbeat: RHEL9 Unit Tests"
Expand All @@ -125,6 +146,12 @@ steps:
artifact_paths:
- "auditbeat/build/*.xml"
- "auditbeat/build/*.json"
plugins:
- test-collector#v1.10.2:
files: "auditbeat/build/TEST-*.xml"
format: "junit"
branches: "main"
debug: true
notify:
- github_commit_status:
context: "auditbeat: Win 2016 Unit Tests"
Expand All @@ -145,6 +172,12 @@ steps:
artifact_paths:
- "auditbeat/build/*.xml"
- "auditbeat/build/*.json"
plugins:
- test-collector#v1.10.2:
files: "auditbeat/build/TEST-*.xml"
format: "junit"
branches: "main"
debug: true
notify:
- github_commit_status:
context: "auditbeat: Win 2022 Unit Tests"
Expand All @@ -157,7 +190,7 @@ steps:
- limit: 1
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
image: "${IMAGE_UBUNTU_2204_X86_64}"
machineType: "${GCP_HI_PERF_MACHINE_TYPE}"
notify:
- github_commit_status:
Expand All @@ -168,7 +201,7 @@ steps:
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*(macOS|arm|integrations).*/

steps:
- label: ":ubuntu: Auditbeat: Ubuntu x86_64 Integration Tests"
- label: ":ubuntu: Auditbeat: Ubuntu x86_64 Integration Tests -- {{matrix.image}}"
key: "auditbeat-extended-integ-tests"
if: build.env("GITHUB_PR_LABELS") =~ /.*integrations.*/
command: |
Expand All @@ -180,16 +213,28 @@ steps:
- limit: 1
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
image: "{{matrix.image}}"
machineType: "${GCP_DEFAULT_MACHINE_TYPE}"
artifact_paths:
- "auditbeat/build/*.xml"
- "auditbeat/build/*.json"
plugins:
- test-collector#v1.10.2:
files: "auditbeat/build/TEST-*.xml"
format: "junit"
branches: "main"
debug: true
notify:
- github_commit_status:
context: "auditbeat: Ubuntu x86_64 Integration Tests"
matrix:
setup:
image:
- "${IMAGE_UBUNTU_2004_X86_64}"
- "${IMAGE_UBUNTU_2204_X86_64}"
- "${IMAGE_UBUNTU_2404_X86_64}"

- label: ":ubuntu: Auditbeat: Ubuntu arm64 Integration Tests"
- label: ":ubuntu: Auditbeat: Ubuntu arm64 Integration Tests -- {{matrix.image}}"
key: "auditbeat-extended-arm64-integ-tests"
if: build.env("GITHUB_PR_LABELS") =~ /.*integrations.*/
command: |
Expand All @@ -201,14 +246,26 @@ steps:
- limit: 1
agents:
provider: "aws"
imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
imagePrefix: "{{matrix.image}}"
instanceType: "${AWS_ARM_INSTANCE_TYPE}"
artifact_paths:
- "auditbeat/build/*.xml"
- "auditbeat/build/*.json"
plugins:
- test-collector#v1.10.2:
files: "auditbeat/build/TEST-*.xml"
format: "junit"
branches: "main"
debug: true
notify:
- github_commit_status:
context: "auditbeat: Ubuntu arm64 Integration Tests"
matrix:
setup:
image:
- "${IMAGE_UBUNTU_2004_ARM64}"
- "${IMAGE_UBUNTU_2204_ARM64}"
- "${IMAGE_UBUNTU_2404_ARM64}"

- label: ":ubuntu: Auditbeat: Ubuntu arm64 Unit Tests"
key: "auditbeat-extended-arm64-unit-tests"
Expand All @@ -222,11 +279,17 @@ steps:
- limit: 1
agents:
provider: "aws"
imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
imagePrefix: "${IMAGE_UBUNTU_2204_ARM64}"
instanceType: "${AWS_ARM_INSTANCE_TYPE}"
artifact_paths:
- "auditbeat/build/*.xml"
- "auditbeat/build/*.json"
plugins:
- test-collector#v1.10.2:
files: "auditbeat/build/TEST-*.xml"
format: "junit"
branches: "main"
debug: true
notify:
- github_commit_status:
context: "auditbeat: Ubuntu arm64 Unit Tests"
Expand All @@ -238,6 +301,9 @@ steps:
source .buildkite/scripts/install_macos_tools.sh
cd auditbeat
mage build unitTest
concurrency_group: "${CONCURRENCY_GROUP}"
concurrency: "${CONCURRENCY_COUNT}"
concurrency_method: "${CONCURRENCY_METHOD}"
retry:
automatic:
- limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability
Expand All @@ -247,6 +313,12 @@ steps:
artifact_paths:
- "auditbeat/build/*.xml"
- "auditbeat/build/*.json"
plugins:
- test-collector#v1.10.2:
files: "auditbeat/build/TEST-*.xml"
format: "junit"
branches: "main"
debug: true
notify:
- github_commit_status:
context: "auditbeat: macOS x86_64 Unit Tests"
Expand All @@ -258,6 +330,9 @@ steps:
source .buildkite/scripts/install_macos_tools.sh
cd auditbeat
mage build unitTest
concurrency_group: "${CONCURRENCY_GROUP}"
concurrency: "${CONCURRENCY_COUNT}"
concurrency_method: "${CONCURRENCY_METHOD}"
retry:
automatic:
- limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability
Expand All @@ -267,6 +342,12 @@ steps:
artifact_paths:
- "auditbeat/build/*.xml"
- "auditbeat/build/*.json"
plugins:
- test-collector#v1.10.2:
files: "auditbeat/build/TEST-*.xml"
format: "junit"
branches: "main"
debug: true
notify:
- github_commit_status:
context: "auditbeat: macOS arm64 Unit Tests"
Expand All @@ -293,6 +374,12 @@ steps:
artifact_paths:
- "auditbeat/build/*.xml"
- "auditbeat/build/*.json"
plugins:
- test-collector#v1.10.2:
files: "auditbeat/build/TEST-*.xml"
format: "junit"
branches: "main"
debug: true
notify:
- github_commit_status:
context: "auditbeat: Win 2019 Unit Tests"
Expand All @@ -314,6 +401,12 @@ steps:
artifact_paths:
- "auditbeat/build/*.xml"
- "auditbeat/build/*.json"
plugins:
- test-collector#v1.10.2:
files: "auditbeat/build/TEST-*.xml"
format: "junit"
branches: "main"
debug: true
notify:
- github_commit_status:
context: "auditbeat: Win 10 Unit Tests"
Expand All @@ -335,6 +428,12 @@ steps:
artifact_paths:
- "auditbeat/build/*.xml"
- "auditbeat/build/*.json"
plugins:
- test-collector#v1.10.2:
files: "auditbeat/build/TEST-*.xml"
format: "junit"
branches: "main"
debug: true
notify:
- github_commit_status:
context: "auditbeat: Win 11 Unit Tests"
Expand Down Expand Up @@ -364,7 +463,7 @@ steps:
timeout_in_minutes: 20
agents:
provider: gcp
image: "${IMAGE_UBUNTU_X86_64}"
image: "${IMAGE_UBUNTU_2204_X86_64}"
machineType: "${GCP_HI_PERF_MACHINE_TYPE}"
notify:
- github_commit_status:
Expand All @@ -385,7 +484,7 @@ steps:
timeout_in_minutes: 20
agents:
provider: "aws"
imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
imagePrefix: "${IMAGE_UBUNTU_2204_ARM64}"
instanceType: "${AWS_ARM_INSTANCE_TYPE}"
notify:
- github_commit_status:
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/deploy/kubernetes/deploy-k8s-pipeline.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ env:
MODULE: "kubernetes"

# Other deps
ASDF_KIND_VERSION: "0.20.0"
ASDF_KIND_VERSION: "0.24.0"

IMAGE_BEATS_WITH_HOOKS_LATEST: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest"

Expand Down
Loading

0 comments on commit 509c814

Please sign in to comment.