From 5630072202b0ab491878aec901516bff5e5efa41 Mon Sep 17 00:00:00 2001
From: Olga Naidjonoka <olga_naidjonoka@epam.com>
Date: Sat, 4 May 2024 12:02:01 +0300
Subject: [PATCH] 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 eb51381f5604..7a9a18e8c526 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"