Skip to content

Commit

Permalink
[7.17](backport #39513) Fixed pipelines formatting (#39515)
Browse files Browse the repository at this point in the history 
* Fixed pipelines formatting (#39513)

(cherry picked from commit 5bff7ec)

# Conflicts:
#	.buildkite/packetbeat/pipeline.packetbeat.yml
#	.buildkite/winlogbeat/pipeline.winlogbeat.yml
#	.buildkite/x-pack/pipeline.xpack.heartbeat.yml
#	.buildkite/x-pack/pipeline.xpack.libbeat.yml
#	.buildkite/x-pack/pipeline.xpack.osquerybeat.yml
#	.buildkite/x-pack/pipeline.xpack.packetbeat.yml
#	.buildkite/x-pack/pipeline.xpack.winlogbeat.yml

* Merged

* merged

* merged

---------

Co-authored-by: Pavel Zorin <pavel.zorin@elastic.co>
  • Loading branch information
@mergify @pazone
mergify[bot] and pazone committed May 16, 2024
1 parent 3122641 commit 5d1fe6b
Show file tree
Hide file tree
Showing 16 changed files with 114 additions and 117 deletions.
12 changes: 6 additions & 6 deletions .buildkite/auditbeat/auditbeat-pipeline.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "aws"
imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
Expand All @@ -56,7 +56,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand All @@ -81,7 +81,7 @@ steps:
mage pythonIntegTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand Down Expand Up @@ -143,7 +143,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "orka"
imagePrefix: "${IMAGE_MACOS_X86_64}"
Expand All @@ -166,7 +166,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_WIN_2016}"
Expand All @@ -187,7 +187,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_WIN_10}"
Expand Down
10 changes: 5 additions & 5 deletions .buildkite/filebeat/filebeat-pipeline.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand Down Expand Up @@ -69,7 +69,7 @@ steps:
mage goIntegTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand All @@ -87,7 +87,7 @@ steps:
mage pythonIntegTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: gcp
image: "${IMAGE_UBUNTU_X86_64}"
Expand Down Expand Up @@ -187,7 +187,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "orka"
imagePrefix: "${IMAGE_MACOS_X86_64}"
Expand Down Expand Up @@ -231,7 +231,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_WIN_10}"
Expand Down
28 changes: 14 additions & 14 deletions .buildkite/heartbeat/heartbeat-pipeline.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand All @@ -54,7 +54,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_RHEL9}"
Expand All @@ -73,7 +73,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_WIN_2016}"
Expand All @@ -93,7 +93,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_WIN_2022}"
Expand All @@ -107,12 +107,12 @@ steps:
context: "Heartbeat: Win-2022 Unit Tests"

- label: ":ubuntu: Heartbeat Go Integration Tests"
command: |
command: |
cd heartbeat
mage goIntegTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand All @@ -130,7 +130,7 @@ steps:
mage pythonIntegTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand All @@ -154,7 +154,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "aws"
imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
Expand All @@ -177,7 +177,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "orka"
imagePrefix: "${IMAGE_MACOS_X86_64}"
Expand All @@ -197,7 +197,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "orka"
imagePrefix: "${IMAGE_MACOS_ARM}"
Expand All @@ -215,12 +215,12 @@ steps:
steps:
- label: ":windows: Heartbeat Win-2019 Unit Tests"
key: "heartbeat-win-extended-2019"
command: |
command: |
Set-Location -Path heartbeat
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_WIN_2019}"
Expand All @@ -240,7 +240,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_WIN_11}"
Expand All @@ -260,7 +260,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_WIN_10}"
Expand Down
12 changes: 6 additions & 6 deletions .buildkite/libbeat/pipeline.libbeat.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand All @@ -47,7 +47,7 @@ steps:
mage goIntegTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand All @@ -67,7 +67,7 @@ steps:
mage pythonIntegTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand Down Expand Up @@ -112,7 +112,7 @@ steps:
make crosscompile
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand All @@ -132,7 +132,7 @@ steps:
make STRESS_TEST_OPTIONS='-timeout=20m -race -v -parallel 1' GOTEST_OUTPUT_OPTIONS=' | go-junit-report > libbeat-stress-test.xml' stress-tests
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand All @@ -154,7 +154,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "aws"
imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
Expand Down
23 changes: 11 additions & 12 deletions .buildkite/metricbeat/pipeline.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ steps:
command: "cd metricbeat && mage build unitTest"
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand Down Expand Up @@ -72,7 +72,7 @@ steps:
cd metricbeat && mage goIntegTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand Down Expand Up @@ -105,7 +105,7 @@ steps:
cd metricbeat && mage pythonIntegTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand All @@ -122,7 +122,7 @@ steps:
command: "make -C metricbeat crosscompile"
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand All @@ -141,7 +141,7 @@ steps:
key: "mandatory-win-2016-unit-tests"
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_WIN_2016}"
Expand All @@ -162,7 +162,7 @@ steps:
key: "mandatory-win-2022-unit-tests"
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_WIN_2022}"
Expand All @@ -187,7 +187,7 @@ steps:
key: "extended-win-10-unit-tests"
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_WIN_10}"
Expand All @@ -208,7 +208,7 @@ steps:
key: "extended-win-11-unit-tests"
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_WIN_11}"
Expand All @@ -229,7 +229,7 @@ steps:
key: "extended-win-2019-unit-tests"
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_WIN_2019}"
Expand All @@ -255,7 +255,7 @@ steps:
cd metricbeat && mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "orka"
imagePrefix: "${IMAGE_MACOS_X86_64}"
Expand All @@ -275,7 +275,7 @@ steps:
cd metricbeat && mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "orka"
imagePrefix: "${IMAGE_MACOS_ARM}"
Expand All @@ -286,7 +286,6 @@ steps:
- github_commit_status:
context: "metricbeat: Extended MacOS arm64 Unit Tests"


- wait: ~
# with PRs, we want to run packaging only if mandatory tests succeed
# for other cases, e.g. merge commits, we want to run packaging (and publish) independently of other tests
Expand Down
Loading

0 comments on commit 5d1fe6b

Please sign in to comment.