Skip to content

Commit

Permalink
Merge branch '8.15' into mergify/bp/8.15/pr-40565
Browse files Browse the repository at this point in the history
  • Loading branch information
VihasMakwana authored Sep 10, 2024
2 parents 257df09 + c50bdd7 commit 5211da0
Show file tree
Hide file tree
Showing 184 changed files with 981 additions and 606 deletions.
32 changes: 16 additions & 16 deletions .buildkite/auditbeat/auditbeat-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ steps:
make check-no-changes
retry:
automatic:
- limit: 3
- limit: 1
agents:
image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest"
cpu: "4000m"
Expand Down Expand Up @@ -66,7 +66,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 1
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand All @@ -85,7 +85,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 1
agents:
provider: "gcp"
image: "${IMAGE_RHEL9}"
Expand All @@ -103,7 +103,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 1
agents:
provider: "gcp"
image: "${IMAGE_WIN_2016}"
Expand All @@ -123,7 +123,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 1
agents:
provider: "gcp"
image: "${IMAGE_WIN_2022}"
Expand All @@ -142,7 +142,7 @@ steps:
make -C auditbeat crosscompile
retry:
automatic:
- limit: 3
- limit: 1
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand All @@ -165,7 +165,7 @@ steps:
mage build integTest
retry:
automatic:
- limit: 3
- limit: 1
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand All @@ -186,7 +186,7 @@ steps:
mage build integTest
retry:
automatic:
- limit: 3
- limit: 1
agents:
provider: "aws"
imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
Expand All @@ -207,7 +207,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 1
agents:
provider: "aws"
imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
Expand All @@ -228,7 +228,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability
agents:
provider: "orka"
imagePrefix: "${IMAGE_MACOS_X86_64}"
Expand All @@ -248,7 +248,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability
agents:
provider: "orka"
imagePrefix: "${IMAGE_MACOS_ARM}"
Expand All @@ -271,7 +271,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 1
agents:
provider: "gcp"
image: "${IMAGE_WIN_2019}"
Expand All @@ -292,7 +292,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 1
agents:
provider: "gcp"
image: "${IMAGE_WIN_10}"
Expand All @@ -313,7 +313,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 1
agents:
provider: "gcp"
image: "${IMAGE_WIN_11}"
Expand Down Expand Up @@ -348,7 +348,7 @@ steps:
mage package
retry:
automatic:
- limit: 3
- limit: 1
timeout_in_minutes: 20
agents:
provider: gcp
Expand All @@ -369,7 +369,7 @@ steps:
mage package
retry:
automatic:
- limit: 3
- limit: 1
timeout_in_minutes: 20
agents:
provider: "aws"
Expand Down
8 changes: 4 additions & 4 deletions .buildkite/deploy/kubernetes/deploy-k8s-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ steps:
make -C deploy/kubernetes test
retry:
automatic:
- limit: 3
- limit: 1
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand All @@ -61,7 +61,7 @@ steps:
make -C deploy/kubernetes test
retry:
automatic:
- limit: 3
- limit: 1
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand All @@ -83,7 +83,7 @@ steps:
make -C deploy/kubernetes test
retry:
automatic:
- limit: 3
- limit: 1
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand All @@ -105,7 +105,7 @@ steps:
make -C deploy/kubernetes test
retry:
automatic:
- limit: 3
- limit: 1
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand Down
28 changes: 14 additions & 14 deletions .buildkite/filebeat/filebeat-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ steps:
make check-no-changes
retry:
automatic:
- limit: 3
- limit: 1
agents:
image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.3"
cpu: "4000m"
Expand All @@ -66,7 +66,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 1
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand All @@ -84,7 +84,7 @@ steps:
mage goIntegTest
retry:
automatic:
- limit: 3
- limit: 1
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand All @@ -102,7 +102,7 @@ steps:
mage pythonIntegTest
retry:
automatic:
- limit: 3
- limit: 1
agents:
provider: gcp
image: "${IMAGE_UBUNTU_X86_64}"
Expand All @@ -121,7 +121,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 1
agents:
provider: "gcp"
image: "${IMAGE_WIN_2016}"
Expand All @@ -142,7 +142,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 1
agents:
provider: "gcp"
image: "${IMAGE_WIN_2022}"
Expand Down Expand Up @@ -171,7 +171,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability
agents:
provider: "orka"
imagePrefix: "${IMAGE_MACOS_X86_64}"
Expand All @@ -192,7 +192,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability
agents:
provider: "orka"
imagePrefix: "${IMAGE_MACOS_ARM}"
Expand All @@ -211,7 +211,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 1
agents:
provider: "aws"
imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
Expand All @@ -235,7 +235,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 1
agents:
provider: "gcp"
image: "${IMAGE_WIN_2019}"
Expand All @@ -256,7 +256,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 1
agents:
provider: "gcp"
image: "${IMAGE_WIN_11}"
Expand All @@ -277,7 +277,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 1
agents:
provider: "gcp"
image: "${IMAGE_WIN_10}"
Expand Down Expand Up @@ -310,7 +310,7 @@ steps:
mage package
retry:
automatic:
- limit: 3
- limit: 1
timeout_in_minutes: 20
agents:
provider: "gcp"
Expand All @@ -332,7 +332,7 @@ steps:
mage package
retry:
automatic:
- limit: 3
- limit: 1
timeout_in_minutes: 20
agents:
provider: "aws"
Expand Down
Loading

0 comments on commit 5211da0

Please sign in to comment.