Skip to content

Commit

Permalink
Merge branch '7.17' into mergify/bp/7.17/pr-39392
Browse files Browse the repository at this point in the history
  • Loading branch information
pierrehilbert authored Jun 20, 2024
2 parents bbb1c21 + 5a16c8f commit 94650a9
Show file tree
Hide file tree
Showing 54 changed files with 462 additions and 471 deletions.
27 changes: 27 additions & 0 deletions .buildkite/auditbeat/auditbeat-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,33 @@ env:
TEST_COVERAGE: "true"

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

steps:
- label: "Run check/update"
command: |
make -C auditbeat check update
make check-no-changes
retry:
automatic:
- limit: 3
agents:
image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest"
cpu: "4000m"
memory: "8Gi"
useCustomGlobalHooks: true
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"
key: "auditbeat-mandatory-tests"

Expand Down
2 changes: 1 addition & 1 deletion .buildkite/filebeat/filebeat-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ steps:
- label: ":ubuntu: Filebeat Go Integration Tests"
command: |
cd filebeat
mage goIntegTest
mage -v goIntegTest
retry:
automatic:
- limit: 3
Expand Down
29 changes: 28 additions & 1 deletion .buildkite/heartbeat/heartbeat-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,33 @@ env:
TEST_COVERAGE: "true"

steps:
- group: "Heartbeat Check/Update"
key: "heartbeat-check-update"

steps:
- label: "Run check/update"
command: |
make -C heartbeat check update
make check-no-changes
retry:
automatic:
- limit: 3
agents:
image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest"
cpu: "4000m"
memory: "8Gi"
useCustomGlobalHooks: true
notify:
- github_commit_status:
context: "hearbeat: 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: "heartbeat-check-update"

- group: "Heartbeat Mandatory Testing"
key: "heartbeat-mandatory-tests"

Expand Down Expand Up @@ -96,7 +123,7 @@ steps:
echo "~~~ Running tests"
cd heartbeat
mage goIntegTest
mage -v goIntegTest
retry:
automatic:
- limit: 3
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/libbeat/pipeline.libbeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ steps:
command: |
set -euo pipefail
cd libbeat
mage goIntegTest
mage -v goIntegTest
retry:
automatic:
- limit: 3
Expand Down
Loading

0 comments on commit 94650a9

Please sign in to comment.