Skip to content

Commit

Permalink
updated namings
Browse files Browse the repository at this point in the history
  • Loading branch information
oakrizan committed Jun 19, 2024
1 parent 637f4df commit 06df0dd
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 56 deletions.
37 changes: 20 additions & 17 deletions .buildkite/winlogbeat/pipeline.winlogbeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ env:
DOCKER_PULL: 0

steps:
- group: "Winlogbeat Check/Update"
- group: "Check/Update"
key: "winlogbeat-check-update"

steps:
- label: "Winlogbeat Run check/update"
- label: "Winlogbeat: Run check/update"
command: |
make -C winlogbeat check update
make check-no-changes
Expand All @@ -50,11 +50,11 @@ steps:
if: build.env("BUILDKITE_PULL_REQUEST") != "false"
depends_on: "winlogbeat-check-update"

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

steps:
- label: ":ubuntu: Winlogbeat Crossccompile"
- label: ":ubuntu: Winlogbeat: Crossccompile"
key: "mandatory-cross-compile"
command: "make -C winlogbeat crosscompile"
retry:
Expand All @@ -71,7 +71,7 @@ steps:
- github_commit_status:
context: "winlogbeat: Crosscompile"

- label: ":windows: Winlogbeat Win-2016 Unit Tests"
- label: ":windows: Winlogbeat: Win 2016 Unit Tests"
command: |
Set-Location -Path winlogbeat
mage build unitTest
Expand All @@ -90,9 +90,9 @@ steps:
- "winlogbeat/build/*.json"
notify:
- github_commit_status:
context: "winlogbeat: Win-2016 Unit Tests"
context: "winlogbeat: Win 2016 Unit Tests"

- label: ":windows: Winlogbeat Win-2019 Unit Tests"
- label: ":windows: Winlogbeat: Win 2019 Unit Tests"
command: |
Set-Location -Path winlogbeat
mage build unitTest
Expand All @@ -111,9 +111,9 @@ steps:
- "winlogbeat/build/*.json"
notify:
- github_commit_status:
context: "winlogbeat: Win-2019 Unit Tests"
context: "winlogbeat: Win 2019 Unit Tests"

- label: ":windows: Winlogbeat Win-2022 Unit Tests"
- label: ":windows: Winlogbeat: Win 2022 Unit Tests"
command: |
Set-Location -Path winlogbeat
mage build unitTest
Expand All @@ -132,14 +132,14 @@ steps:
- "winlogbeat/build/*.json"
notify:
- github_commit_status:
context: "Winlogbeat: Win-2022 Unit Tests"
context: "Winlogbeat: Win 2022 Unit Tests"

- group: "Winlogbeat Extended Windows Tests"
- group: "Extended Windows Tests"
key: "winlogbeat-extended-win-tests"
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/

steps:
- label: ":windows: Winlogbeat Win-10 Unit Tests"
- label: ":windows: Winlogbeat: Win 10 Unit Tests"
command: |
Set-Location -Path winlogbeat
mage build unitTest
Expand All @@ -158,9 +158,9 @@ steps:
- "winlogbeat/build/*.json"
notify:
- github_commit_status:
context: "winlogbeat: Win-10 Unit Tests"
context: "winlogbeat: Win 10 Unit Tests"

- label: ":windows: Winlogbeat Win-11 Unit Tests"
- label: ":windows: Winlogbeat: Win 11 Unit Tests"
command: |
Set-Location -Path winlogbeat
mage build unitTest
Expand All @@ -179,16 +179,19 @@ steps:
- "winlogbeat/build/*.json"
notify:
- github_commit_status:
context: "winlogbeat: Win-11 Unit Tests"
context: "winlogbeat: Win 11 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
# this allows building DRA artifacts even if there is flakiness in mandatory tests
if: build.env("BUILDKITE_PULL_REQUEST") != "false"
depends_on: "winlogbeat-mandatory-tests"

- group: "Winlogbeat Packaging"
- group: "Packaging"
key: "winlogbeat-packaging"
steps:
- label: ":ubuntu: Winlogbeat Packaging Linux"
- label: ":ubuntu: Winlogbeat: Packaging Linux"
key: "packaging-linux"
command: |
cd winlogbeat
Expand Down
54 changes: 27 additions & 27 deletions .buildkite/x-pack/pipeline.xpack.auditbeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ env:
TEST_COVERAGE: "true"

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

steps:
- label: "Run check/update"
- label: "X-pack/auditbeat: Run check/update"
command: |
make -C x-pack/auditbeat check update
make check-no-changes
Expand All @@ -46,19 +46,19 @@ steps:
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"

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

steps:
- label: ":ubuntu: x-pack/auditbeat Build (MODULE) Tests"
- label: ":ubuntu: x-pack/auditbeat: Build Tests"
key: "mandatory-linux-unit-test"
command: |
set -euo pipefail
Expand All @@ -80,9 +80,9 @@ steps:
- "x-pack/auditbeat/build/*.json"
notify:
- github_commit_status:
context: "x-pack/auditbeat: Build (MODULE) Tests"
context: "x-pack/auditbeat: Build Tests"

- label: ":rhel: x-pack/auditbeat RHEL9 Unit Tests"
- label: ":rhel: x-pack/auditbeat: RHEL9 Unit Tests"
key: "mandatory-rhel9-unit-test"
command: |
cd x-pack/auditbeat
Expand All @@ -101,7 +101,7 @@ steps:
- github_commit_status:
context: "x-pack/auditbeat: RHEL9 Unit Tests"

- label: ":windows: x-pack/auditbeat Windows 2022 Unit Tests"
- label: ":windows: x-pack/auditbeat: Win 2022 Unit Tests"
key: "mandatory-win-2022-unit-tests"
command: |
Set-Location -Path x-pack/auditbeat
Expand All @@ -120,9 +120,9 @@ steps:
- "x-pack/auditbeat/build/*.json"
notify:
- github_commit_status:
context: "x-pack/auditbeat: Windows 2022 Unit Tests"
context: "x-pack/auditbeat: Win 2022 Unit Tests"

- label: ":windows: x-pack/auditbeat Windows 2016 Unit Tests"
- label: ":windows: x-pack/auditbeat: Win 2016 Unit Tests"
command: |
Set-Location -Path x-pack/auditbeat
mage build unitTest
Expand All @@ -141,14 +141,14 @@ steps:
- "x-pack/auditbeat/build/*.json"
notify:
- github_commit_status:
context: "x-pack/auditbeat: Windows 2016 Unit Tests"
context: "x-pack/auditbeat: Win 2016 Unit Tests"

- group: "x-pack/auditbeat Extended Windows Tests"
- group: "Extended Windows Tests"
key: "x-pack-auditbeat-extended-win-tests"
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/

steps:
- label: ":windows: x-pack/auditbeat Windows 2019 Unit Tests"
- label: ":windows: x-pack/auditbeat: Win 2019 Unit Tests"
command: |
Set-Location -Path x-pack/auditbeat
mage build unitTest
Expand All @@ -167,9 +167,9 @@ steps:
- "x-pack/auditbeat/build/*.json"
notify:
- github_commit_status:
context: "x-pack/auditbeat: Windows 2019 Extended Tests"
context: "x-pack/auditbeat: Win 2019 Unit Tests"

- label: ":windows: x-pack/auditbeat Windows 10 Unit Tests"
- label: ":windows: x-pack/auditbeat: Win 10 Unit Tests"
command: |
Set-Location -Path x-pack/auditbeat
mage build unitTest
Expand All @@ -188,9 +188,9 @@ steps:
- "x-pack/auditbeat/build/*.json"
notify:
- github_commit_status:
context: "x-pack/auditbeat: Windows 10 Extended Tests"
context: "x-pack/auditbeat: Win 10 Unit Tests"

- label: ":windows: x-pack/auditbeat Windows 11 Unit Tests"
- label: ":windows: x-pack/auditbeat: Win 11 Unit Tests"
command: |
Set-Location -Path x-pack/auditbeat
mage build unitTest
Expand All @@ -209,14 +209,14 @@ steps:
- "x-pack/auditbeat/build/*.json"
notify:
- github_commit_status:
context: "x-pack/auditbeat: Windows 11 Extended Tests"
context: "x-pack/auditbeat: Win 11 Unit Tests"

- group: "x-pack/auditbeat Extended Tests"
- group: "Extended Tests"
key: "x-pack-auditbeat-extended-tests"
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*(macOS|arm).*/

steps:
- label: ":mac: x-pack/auditbeat macOS x86_64 Unit Tests"
- label: ":mac: x-pack/auditbeat: macOS x86_64 Unit Tests"
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
command: |
set -euo pipefail
Expand All @@ -236,7 +236,7 @@ steps:
- github_commit_status:
context: "x-pack/auditbeat: macOS x86_64 Unit Tests"

- label: ":mac: x-pack/auditbeat macOS arm64 Unit Tests"
- label: ":mac: x-pack/auditbeat: macOS arm64 Unit Tests"
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
command: |
set -euo pipefail
Expand All @@ -256,7 +256,7 @@ steps:
- github_commit_status:
context: "x-pack/auditbeat: macOS arm64 Unit Tests"

- label: ":ubuntu: x-pack/auditbeat Linux arm64 Unit Tests"
- label: ":ubuntu: x-pack/auditbeat: Ubuntu arm64 Unit Tests"
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/
command: |
cd x-pack/auditbeat
Expand All @@ -273,7 +273,7 @@ steps:
- "x-pack/auditbeat/build/*.json"
notify:
- github_commit_status:
context: "x-pack/auditbeat: Linux arm64 Unit Tests"
context: "x-pack/auditbeat: Ubuntu arm64 Unit Tests"

- wait: ~
# with PRs, we want to run packaging only if mandatory tests succeed
Expand All @@ -283,11 +283,11 @@ steps:
depends_on:
- step: "x-pack-auditbeat-mandatory-tests"

- group: "x-pack/auditbeat Packaging"
- group: "Packaging"
key: "x-pack-auditbeat-packaging"

steps:
- label: ":ubuntu: x-pack/auditbeat Packaging Linux"
- label: ":ubuntu: x-pack/auditbeat: Packaging Linux"
key: "packaging-linux"
command: |
cd x-pack/auditbeat
Expand All @@ -308,7 +308,7 @@ steps:
- github_commit_status:
context: "x-pack/auditbeat: Packaging Linux"

- label: ":ubuntu: x-pack/auditbeat Packaging Linux arm64"
- label: ":ubuntu: x-pack/auditbeat: Packaging Linux arm64"
key: "packaging-arm"
command: |
cd x-pack/auditbeat
Expand Down
22 changes: 11 additions & 11 deletions .buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ env:
TEST_COVERAGE: "true"

steps:
- group: "x-pack/dockerlogbeat Check/Update"
- group: "Check/Update"
key: "x-pack-dockerlogbeat-check-update"
steps:
- label: "Run check/update"
- label: "x-pack/dockerlogbeat: Run check/update"
command: |
make -C x-pack/dockerlogbeat check update
make check-no-changes
Expand All @@ -36,18 +36,18 @@ steps:
notify:
- github_commit_status:
context: "x-pack/dockerlogbeat: 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-dockerlogbeat-check-update"

- group: "x-pack/dockerlogbeat Mandatory Tests"
- group: "Mandatory Tests"
key: "xpack-dockerlogbeat-mandatory-tests"
steps:
- label: ":ubuntu: x-pack/dockerlogbeat Ubuntu Unit Tests"
- label: ":ubuntu: x-pack/dockerlogbeat: Ubuntu x86_64 Unit Tests"
key: "mandatory-linux-unit-test"
command: |
cd x-pack/dockerlogbeat
Expand All @@ -64,9 +64,9 @@ steps:
- "x-pack/dockerlogbeat/build/*.json"
notify:
- github_commit_status:
context: "x-pack/dockerlogbeat: Ubuntu Unit Tests"
context: "x-pack/dockerlogbeat: Ubuntu x86_64 Unit Tests"

- label: ":ubuntu: x-pack/dockerlogbeat Go (Module) Integration Tests"
- label: ":ubuntu: x-pack/dockerlogbeat: Go Integration Tests"
key: "mandatory-int-test"
command: |
set -euo pipefail
Expand All @@ -88,7 +88,7 @@ steps:
- "x-pack/dockerlogbeat/build/*.json"
notify:
- github_commit_status:
context: "x-pack/dockerlogbeat: Go (Module) Integration Tests"
context: "x-pack/dockerlogbeat: Go Integration Tests"

- wait: ~
# with PRs, we want to run packaging only if mandatory tests succeed
Expand All @@ -98,11 +98,11 @@ steps:
depends_on:
- "xpack-dockerlogbeat-mandatory-tests"

- group: "x-pack/dockerlogbeat Packaging"
- group: "Packaging"
key: "xpack-dockerlogbeat-packaging"

steps:
- label: ":ubuntu: x-pack/dockerlogbeat Packaging Linux"
- label: ":ubuntu: x-pack/dockerlogbeat: Packaging Linux"
key: "auditbeat-package-linux-x86"
env:
PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
Expand All @@ -122,7 +122,7 @@ steps:
- github_commit_status:
context: "x-pack/dockerlogbeat: Packaging Linux"

- label: ":linux: x-pack/dockerlogbeat Packaging Linux arm64"
- label: ":ubuntu: x-pack/dockerlogbeat: Packaging Linux arm64"
key: "auditbeat-package-linux-arm"
env:
PLATFORMS: "linux/arm64"
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/x-pack/pipeline.xpack.filebeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ steps:
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
Expand Down

0 comments on commit 06df0dd

Please sign in to comment.