From a16134420c8a69484fb414fd059b9a76439481c4 Mon Sep 17 00:00:00 2001 From: Olga Naidjonoka Date: Fri, 26 Apr 2024 18:29:36 +0300 Subject: [PATCH 1/4] updated win-2016 test cmd --- .buildkite/x-pack/pipeline.xpack.heartbeat.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml index 136706e698c..b7582972ede 100644 --- a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml @@ -2,7 +2,8 @@ name: "beats-xpack-heartbeat" env: - AWS_ARM_INSTANCE_TYPE: "t4g.xlarge" + AWS_ARM_INSTANCE_TYPE: "m6g.xlarge" + AWS_IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2204-aarch64" GCP_DEFAULT_MACHINE_TYPE: "c2d-highcpu-8" GCP_HI_PERF_MACHINE_TYPE: "c2d-highcpu-16" @@ -11,7 +12,6 @@ env: IMAGE_MACOS_ARM: "generic-13-ventura-arm" IMAGE_MACOS_X86_64: "generic-13-ventura-x64" IMAGE_RHEL9_X86_64: "family/platform-ingest-beats-rhel-9" - 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" @@ -81,7 +81,7 @@ steps: skip: "skipping due to elastic/beats#23957 and elastic/beats#23958" command: | Set-Location -Path x-pack/heartbeat - mage build unitTest + mage build test retry: automatic: - limit: 3 @@ -98,6 +98,7 @@ steps: - github_commit_status: context: "x-pack/heartbeat: Windows 2016 Unit Tests" + # Doesn't exist in Jenkins - label: ":windows: Windows 2022 Unit Tests" key: "mandatory-win-2022-unit-tests" skip: "skipping due to elastic/beats#23957 and elastic/beats#23958" @@ -124,6 +125,7 @@ steps: key: "x-pack-heartbeat-extended-win-tests" if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/ skip: "skipping due to elastic/beats#23957 and elastic/beats#23958" + steps: - label: ":windows: Windows 10 Unit Tests" command: | @@ -146,6 +148,7 @@ steps: - github_commit_status: context: "x-pack/heartbeat: Windows 10 Unit Tests" + # Doesn't exist in Jenkins - label: ":windows: Windows 11 Unit Tests" command: | Set-Location -Path x-pack/heartbeat @@ -191,6 +194,7 @@ steps: - group: "x-pack/heartbeat MacOS Extended Tests" key: "x-pack-heartbeat-extended-tests-macos" if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/ + steps: - label: ":mac: MacOS x86_64 Unit Tests" command: | @@ -235,6 +239,9 @@ steps: context: "x-pack/heartbeat: MacOS arm64 Extended 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: - step: "x-pack-heartbeat-mandatory-tests" @@ -267,7 +274,7 @@ steps: mage package agents: provider: "aws" - imagePrefix: "${IMAGE_UBUNTU_ARM_64}" + imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}" instanceType: "${AWS_ARM_INSTANCE_TYPE}" env: PLATFORMS: "linux/arm64" From 44b6b043bda15953396fe9f7ca5539ba7f7e425f Mon Sep 17 00:00:00 2001 From: Olga Naidjonoka Date: Wed, 1 May 2024 17:57:38 +0300 Subject: [PATCH 2/4] updated macos namimg --- .buildkite/x-pack/pipeline.xpack.heartbeat.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml index b7582972ede..eb51381f560 100644 --- a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml @@ -191,12 +191,12 @@ steps: - github_commit_status: context: "x-pack/heartbeat: Windows 2019 Unit Tests" - - group: "x-pack/heartbeat MacOS Extended Tests" + - group: "x-pack/heartbeat macOS Extended Tests" key: "x-pack-heartbeat-extended-tests-macos" if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/ steps: - - label: ":mac: MacOS x86_64 Unit Tests" + - label: ":mac: macOS x86_64 Unit Tests" command: | set -euo pipefail source .buildkite/scripts/install_macos_tools.sh @@ -215,9 +215,9 @@ steps: - "x-pack/heartbeat/build/*.json" notify: - github_commit_status: - context: "x-pack/heartbeat: MacOS x86_64 Extended Tests" + context: "x-pack/heartbeat: macOS x86_64 Extended Tests" - - label: ":mac: MacOS arm64 Unit Tests" + - label: ":mac: macOS arm64 Unit Tests" command: | set -euo pipefail source .buildkite/scripts/install_macos_tools.sh @@ -236,7 +236,7 @@ steps: - "x-pack/heartbeat/build/*.json" notify: - github_commit_status: - context: "x-pack/heartbeat: MacOS arm64 Extended Tests" + context: "x-pack/heartbeat: macOS arm64 Extended Tests" - wait: ~ # with PRs, we want to run packaging only if mandatory tests succeed From 0ddb3bc64bfcdf025f108439f8579c0ea2a666fc Mon Sep 17 00:00:00 2001 From: Olga Naidjonoka Date: Sat, 4 May 2024 12:02:01 +0300 Subject: [PATCH 3/4] pr fixes --- .../x-pack/pipeline.xpack.heartbeat.yml | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml index eb51381f560..7a9a18e8c52 100644 --- a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml @@ -30,7 +30,7 @@ steps: - group: "x-pack/heartbeat Mandatory Tests" key: "x-pack-heartbeat-mandatory-tests" steps: - - label: ":linux: Ubuntu Unit Tests" + - label: ":ubuntu: x-pack/heartbeat Ubuntu Unit Tests" key: "mandatory-linux-unit-test" command: | set -euo pipefail @@ -53,7 +53,7 @@ steps: - github_commit_status: context: "x-pack/heartbeat: Ubuntu Unit Tests" - - label: ":go: Go Integration Tests" + - label: ":ubuntu: x-pack/heartbeat Go Integration Tests" key: "mandatory-int-test" command: | set -euo pipefail @@ -76,7 +76,7 @@ steps: - github_commit_status: context: "x-pack/heartbeat: Go Integration Tests" - - label: ":windows: Windows 2016 Unit Tests" + - label: ":windows: x-pack/heartbeat Windows 2016 Unit Tests" key: "mandatory-win-2016-unit-tests" skip: "skipping due to elastic/beats#23957 and elastic/beats#23958" command: | @@ -99,7 +99,7 @@ steps: context: "x-pack/heartbeat: Windows 2016 Unit Tests" # Doesn't exist in Jenkins - - label: ":windows: Windows 2022 Unit Tests" + - label: ":windows: x-pack/heartbeat Windows 2022 Unit Tests" key: "mandatory-win-2022-unit-tests" skip: "skipping due to elastic/beats#23957 and elastic/beats#23958" command: | @@ -127,7 +127,7 @@ steps: skip: "skipping due to elastic/beats#23957 and elastic/beats#23958" steps: - - label: ":windows: Windows 10 Unit Tests" + - label: ":windows: x-pack/heartbeat Windows 10 Unit Tests" command: | Set-Location -Path x-pack/heartbeat mage build test @@ -149,7 +149,7 @@ steps: context: "x-pack/heartbeat: Windows 10 Unit Tests" # Doesn't exist in Jenkins - - label: ":windows: Windows 11 Unit Tests" + - label: ":windows: x-pack/heartbeat Windows 11 Unit Tests" command: | Set-Location -Path x-pack/heartbeat mage build test @@ -170,7 +170,7 @@ steps: - github_commit_status: context: "x-pack/heartbeat: Windows 11 Unit Tests" - - label: ":windows: Windows 2019 Unit Tests" + - label: ":windows: x-pack/heartbeat Windows 2019 Unit Tests" command: | Set-Location -Path x-pack/heartbeat mage build test @@ -196,7 +196,7 @@ steps: if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/ steps: - - label: ":mac: macOS x86_64 Unit Tests" + - label: ":mac: x-pack/heartbeat macOS x86_64 Unit Tests" command: | set -euo pipefail source .buildkite/scripts/install_macos_tools.sh @@ -217,7 +217,7 @@ steps: - github_commit_status: context: "x-pack/heartbeat: macOS x86_64 Extended Tests" - - label: ":mac: macOS arm64 Unit Tests" + - label: ":mac: x-pack/heartbeat macOS arm64 Unit Tests" command: | set -euo pipefail source .buildkite/scripts/install_macos_tools.sh @@ -246,13 +246,14 @@ steps: depends_on: - step: "x-pack-heartbeat-mandatory-tests" - - group: "Packaging" - key: "packaging" + - group: "x-pack/heartbeat Packaging" + key: "x-pack-heartbeat-packaging" if: build.env("BUILDKITE_PULL_REQUEST") != "false" steps: - - label: ":linux: Packaging Linux" + - label: ":ubuntu: x-pack/heartbeat Packaging Linux x86_64" key: "packaging-linux" command: | + set -euo pipefail cd x-pack/heartbeat mage package agents: @@ -265,11 +266,12 @@ steps: PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64" notify: - github_commit_status: - context: "x-pack/heartbeat: Packaging Linux" + context: "x-pack/heartbeat: Packaging Linux x86_64" - - label: ":linux: Packaging ARM" + - label: ":ubuntu: x-pack/heartbeat Packaging Linux arm64" key: "packaging-arm" command: | + set -euo pipefail cd x-pack/heartbeat mage package agents: @@ -281,4 +283,4 @@ steps: PACKAGES: "docker" notify: - github_commit_status: - context: "x-pack/heartbeat: Packaging Linux ARM" + context: "x-pack/heartbeat: Packaging Linux arm64" From 5c050bbe45ffbdcd7162e2ebff2d3300283c9b2c Mon Sep 17 00:00:00 2001 From: Olga Naidjonoka Date: Sat, 4 May 2024 12:24:47 +0300 Subject: [PATCH 4/4] removed pipeline masking where irrelevant --- .buildkite/x-pack/pipeline.xpack.heartbeat.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml index 7a9a18e8c52..239bd033568 100644 --- a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml @@ -253,7 +253,6 @@ steps: - label: ":ubuntu: x-pack/heartbeat Packaging Linux x86_64" key: "packaging-linux" command: | - set -euo pipefail cd x-pack/heartbeat mage package agents: @@ -271,7 +270,6 @@ steps: - label: ":ubuntu: x-pack/heartbeat Packaging Linux arm64" key: "packaging-arm" command: | - set -euo pipefail cd x-pack/heartbeat mage package agents: