Skip to content

Commit

Permalink
Merge branch '7.17' into updatecli_7.17_bump-golang-version-7.17
Browse files Browse the repository at this point in the history
  • Loading branch information
cmacknz authored Jun 17, 2024
2 parents 3a4cc2b + df1a0d7 commit 9479be2
Show file tree
Hide file tree
Showing 17 changed files with 229 additions and 130 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
26 changes: 26 additions & 0 deletions .buildkite/filebeat/filebeat-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
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/packetbeat/pipeline.packetbeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,32 @@ env:
TEST_COVERAGE: "true"

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

- group: "packetbeat Mandatory Tests"
key: "packetbeat-mandatory-tests"
steps:
Expand Down
27 changes: 27 additions & 0 deletions .buildkite/x-pack/pipeline.xpack.auditbeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,33 @@ env:
TEST_COVERAGE: "true"

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

steps:
- label: "Run check/update"
command: |
make -C x-pack/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: "x-pack/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: "x-pack-auditbeat-check-update"

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

Expand Down
27 changes: 27 additions & 0 deletions .buildkite/x-pack/pipeline.xpack.filebeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

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
26 changes: 26 additions & 0 deletions .buildkite/x-pack/pipeline.xpack.packetbeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,32 @@ env:
TEST_COVERAGE: "true"

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

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

Expand Down
25 changes: 0 additions & 25 deletions .github/workflows/check-audtibeat.yml

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

Loading

0 comments on commit 9479be2

Please sign in to comment.