From 2562e448143f9e619d7224b667529f26e507c99e Mon Sep 17 00:00:00 2001 From: Olga Naydyonock Date: Thu, 23 May 2024 13:07:22 +0300 Subject: [PATCH] updated xpack/libbeat pipeline (#39642) Updated x-pack/libbeat pipeline to match same steps/commands as in Jenkins and to apply same naming style as in other BK pipelines for beats --- .buildkite/x-pack/pipeline.xpack.libbeat.yml | 51 +++++++++++--------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/.buildkite/x-pack/pipeline.xpack.libbeat.yml b/.buildkite/x-pack/pipeline.xpack.libbeat.yml index 6c26e9614df2..33356c78c468 100644 --- a/.buildkite/x-pack/pipeline.xpack.libbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.libbeat.yml @@ -2,11 +2,9 @@ name: "beats-xpack-libbeat" env: - AWS_ARM_INSTANCE_TYPE: "t4g.xlarge" - GCP_DEFAULT_MACHINE_TYPE: "c2d-highcpu-8" - GCP_HI_PERF_MACHINE_TYPE: "c2d-highcpu-16" - GCP_WIN_MACHINE_TYPE: "n2-standard-8" - IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2204-aarch64" + AWS_ARM_INSTANCE_TYPE: "m6g.xlarge" + AWS_IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2204-aarch64" + IMAGE_UBUNTU_X86_64: "family/platform-ingest-beats-ubuntu-2204" IMAGE_WIN_10: "family/platform-ingest-beats-windows-10" IMAGE_WIN_11: "family/platform-ingest-beats-windows-11" @@ -14,6 +12,10 @@ env: IMAGE_WIN_2019: "family/platform-ingest-beats-windows-2019" IMAGE_WIN_2022: "family/platform-ingest-beats-windows-2022" + GCP_DEFAULT_MACHINE_TYPE: "c2d-highcpu-8" + GCP_HI_PERF_MACHINE_TYPE: "c2d-highcpu-16" + GCP_WIN_MACHINE_TYPE: "n2-standard-8" + #Deps ASDF_MAGE_VERSION: 1.15.0 @@ -24,8 +26,9 @@ env: steps: - group: "x-pack/libbeat Mandatory Tests" key: "x-pack-libbeat-mandatory-tests" + steps: - - label: ":linux: Ubuntu Unit Tests" + - label: ":ubuntu: x-pack/libbeat Unit Tests" key: "mandatory-linux-unit-test" command: | cd x-pack/libbeat @@ -42,9 +45,9 @@ steps: - "x-pack/libbeat/build/*.json" notify: - github_commit_status: - context: "x-pack/libbeat: Ubuntu Unit Tests" + context: "x-pack/libbeat: Unit Tests" - - label: ":go: Go Integration Tests" + - label: ":ubuntu: x-pack/libbeat Go Integration Tests" key: "mandatory-int-test" command: | cd x-pack/libbeat @@ -63,7 +66,7 @@ steps: - github_commit_status: context: "x-pack/libbeat: Go Integration Tests" - - label: ":python: Python Integration Tests" + - label: ":ubuntu: x-pack/libbeat Python Integration Tests" key: "mandatory-python-int-test" command: | cd x-pack/libbeat @@ -82,7 +85,7 @@ steps: - github_commit_status: context: "x-pack/libbeat: Python Integration Tests" - - label: ":windows: Windows 2016 Unit Tests" + - label: ":windows: x-pack/libbeat Win-2016 Unit Tests" command: | Set-Location -Path x-pack/libbeat mage -w reader\etw build goUnitTest @@ -101,9 +104,9 @@ steps: - "x-pack/libbeat/build/*.json" notify: - github_commit_status: - context: "x-pack/libbeat: Windows 2016 Unit Tests" + context: "x-pack/libbeat: Win-2016 Unit Tests" - - label: ":windows: Windows 2022 Unit Tests" + - label: ":windows: x-pack/libbeat Win-2022 Unit Tests" command: | Set-Location -Path x-pack/libbeat mage -w reader\etw build goUnitTest @@ -122,13 +125,14 @@ steps: - "x-pack/libbeat/build/*.json" notify: - github_commit_status: - context: "x-pack/libbeat: Windows 2022 Unit Tests" + context: "x-pack/libbeat: Win-2022 Unit Tests" - group: "x-pack/libbeat Extended Windows Tests" key: "x-pack-libbeat-extended-win-tests" if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/ + steps: - - label: ":windows: Windows 10 Unit Tests" + - label: ":windows: x-pack/libbeat Win 10 Unit Tests" command: | Set-Location -Path x-pack/libbeat mage -w reader\etw build goUnitTest @@ -147,9 +151,9 @@ steps: - "x-pack/libbeat/build/*.json" notify: - github_commit_status: - context: "x-pack/libbeat: Windows 10 Unit Tests" + context: "x-pack/libbeat: Win 10 Unit Tests" - - label: ":windows: Windows 11 Unit Tests" + - label: ":windows: x-pack/libbeat Win 11 Unit Tests" command: | Set-Location -Path x-pack/libbeat mage -w reader\etw build goUnitTest @@ -168,9 +172,9 @@ steps: - "x-pack/libbeat/build/*.json" notify: - github_commit_status: - context: "x-pack/libbeat: Windows 11 Unit Tests" + context: "x-pack/libbeat: Win 11 Unit Tests" - - label: ":windows: Windows 2019 Unit Tests" + - label: ":windows: x-pack/libbeat Win-2019 Unit Tests" command: | Set-Location -Path x-pack/libbeat mage -w reader\etw build goUnitTest @@ -189,13 +193,14 @@ steps: - "x-pack/libbeat/build/*.json" notify: - github_commit_status: - context: "x-pack/libbeat: Windows 2019 Unit Tests" + context: "x-pack/libbeat: Win-2019 Unit Tests" - - group: "x-pack/libbeat Linux arm Extended Tests" + - group: "x-pack/libbeat Extended Tests" key: "x-pack-libbeat-extended-tests-linux-arm" if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/ + steps: - - label: ":linux: Ubuntu ARM64 Unit Tests" + - label: ":ubuntu: x-pack/libbeat arm64 Unit Tests" key: "extended-arm64-unit-tests" command: | cd x-pack/libbeat @@ -205,11 +210,11 @@ steps: - limit: 3 agents: provider: "aws" - imagePrefix: "${IMAGE_UBUNTU_ARM_64}" + imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}" instanceType: "${AWS_ARM_INSTANCE_TYPE}" artifact_paths: - "x-pack/libbeat/build/*.xml" - "x-pack/libbeat/build/*.json" notify: - github_commit_status: - context: "x-pack/libbeat: Ubuntu ARM64 Extended Unit Tests" + context: "x-pack/libbeat: Linux arm64 Unit Tests"