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
  • Loading branch information
pierrehilbert authored Jun 13, 2024
2 parents 3b561b0 + 18d2057 commit c58f1d4
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 30 deletions.
28 changes: 27 additions & 1 deletion .buildkite/libbeat/pipeline.libbeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,33 @@ env:
TEST_COVERAGE: "true"

steps:
- group: "Libbeat Mandatory Tests"
- group: "libbeat Check/Update"
key: "libbeat-check-update"
steps:
- label: "Run check/update"
command: |
make -C libbeat 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: "libbeat: 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: "libbeat-check-update"

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

steps:
Expand Down
26 changes: 26 additions & 0 deletions .buildkite/x-pack/pipeline.xpack.libbeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,32 @@ env:
TEST_COVERAGE: "true"

steps:
- group: "x-pack/libbeat Check/Update"
key: "x-pack-libbeat-check-update"
steps:
- label: "Run check/update"
command: |
make -C x-pack/libbeat 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: "x-pack/libbeat: 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-libbeat-check-update"

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

Expand Down
29 changes: 0 additions & 29 deletions .github/workflows/check-libbeat.yml

This file was deleted.

0 comments on commit c58f1d4

Please sign in to comment.