Skip to content

Commit

Permalink
Merge branch '7.17' into prepare-changelog-7.17.22
Browse files Browse the repository at this point in the history
pierrehilbert authored Jun 14, 2024
2 parents c58f1d4 + e214cf4 commit 95e51e1
Showing 3 changed files with 53 additions and 29 deletions.
26 changes: 26 additions & 0 deletions .buildkite/filebeat/filebeat-pipeline.yml
Original file line number Diff line number Diff line change
@@ -24,6 +24,32 @@ env:
TEST_COVERAGE: "true"

steps:
- group: "Filebeat Check/Update"
key: "filebeat-check-update"
steps:
- label: "Run check/update"
command: |
make -C filebeat 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:0.3"
cpu: "4000m"
memory: "8Gi"
useCustomGlobalHooks: true
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"
key: "filebeat-mandatory-tests"
steps:
27 changes: 27 additions & 0 deletions .buildkite/x-pack/pipeline.xpack.filebeat.yml
Original file line number Diff line number Diff line change
@@ -24,6 +24,33 @@ env:
TEST_COVERAGE: "true"

steps:
- group: "x-pack/filebeat Check/Update"
key: "x-pack-filebeat-check-update"
steps:
- label: "Run check/update"
command: |
make -C x-pack/filebeat 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:0.3"
cpu: "4000m"
memory: "8Gi"
useCustomGlobalHooks: true
notify:
- github_commit_status:
context: "x-pack-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: "x-pack-filebeat-check-update"


- group: "x-pack/filebeat Mandatory Tests"
key: "x-pack-filebeat-mandatory-tests"

29 changes: 0 additions & 29 deletions .github/workflows/check-filebeat.yml

This file was deleted.

0 comments on commit 95e51e1

Please sign in to comment.