From befd3ef7fc2705da447c0d09e26ec32394530b7d Mon Sep 17 00:00:00 2001
From: Olga Naidjonoka <olga_naidjonoka@epam.com>
Date: Thu, 18 Apr 2024 14:50:21 +0300
Subject: [PATCH] fixed issues in heartbeat pipeline

---
 .buildkite/heartbeat/heartbeat-pipeline.yml | 54 +++++++++++++++------
 1 file changed, 40 insertions(+), 14 deletions(-)

diff --git a/.buildkite/heartbeat/heartbeat-pipeline.yml b/.buildkite/heartbeat/heartbeat-pipeline.yml
index 0ab91594c25..f0ac285dd53 100644
--- a/.buildkite/heartbeat/heartbeat-pipeline.yml
+++ b/.buildkite/heartbeat/heartbeat-pipeline.yml
@@ -24,9 +24,12 @@ env:
 steps:
   - group: "Heartbeat Mandatory Testing"
     key: "heartbeat-mandatory-tests"
+
     steps:
       - label: ":ubuntu: Unit Tests"
-        command: "cd heartbeat && mage build unitTest"
+        command: |
+          cd heartbeat
+          mage build unitTest
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -36,7 +39,9 @@ steps:
           - "heartbeat/build/*.json"
 
       - label: ":rhel: Heartbeat Rhel9 Unit Tests"
-        command: "cd heartbeat && mage build unitTest"
+        command: |
+          cd heartbeat
+          mage build unitTest
         agents:
           provider: "gcp"
           image: "${IMAGE_RHEL9}"
@@ -74,7 +79,9 @@ steps:
           - "heartbeat/build/*.json"
 
       - label: ":ubuntu: Heartbeat Go Integration Tests"
-        command: "cd heartbeat && mage goIntegTest"
+        command:  |
+          cd heartbeat
+          mage goIntegTest
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -84,7 +91,9 @@ steps:
           - "heartbeat/build/*.json"
 
       - label: ":ubuntu: Heartbeat Python Integration Tests"
-        command: "cd heartbeat && mage pythonIntegTest"
+        command: |
+          cd heartbeat
+          mage pythonIntegTest
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -96,11 +105,13 @@ steps:
   - group: "Heartbeat ARM Tests"
     key: "heartbeat-extended-tests-arm"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/
+
     steps:
       - label: ":linux: Heartbeat ARM64 Unit Tests"
         key: "arm-extended"
-        if: build.env("GITHUB_PR_TRIGGER_COMMENT") == "heartbeat for arm" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/
-        command: "cd heartbeat && mage build unitTest"
+        command: |
+          cd heartbeat
+          mage build unitTest
         agents:
           provider: "aws"
           imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
@@ -110,11 +121,13 @@ steps:
   - group: "Heartbeat Extended Testing MacOS"
     key: "heartbeat-extended-tests-macos"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
+
     steps:
       - label: ":mac: Heartbeat MacOS Unit Tests"
         key: "macos-extended"
-        if: build.env("GITHUB_PR_TRIGGER_COMMENT") == "heartbeat for macos" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
-        command: "cd ${BEATS_PROJECT_NAME} && mage build unitTest"
+        command: |
+          cd heartbeat
+          mage build unitTest
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_X86_64}"
@@ -127,7 +140,9 @@ steps:
     steps:
       - label: ":windows: Heartbeat Win-2019 Unit Tests"
         key: "heartbeat-win-extended-2019"
-        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
+        command:  |
+          Set-Location -Path heartbeat
+          mage build unitTest
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2019}"
@@ -165,22 +180,28 @@ steps:
           - "heartbeat/build/*.xml"
           - "heartbeat/build/*.json"
 
+  - wait: ~
+    if: build.env("BUILDKITE_PULL_REQUEST") != "false"
+    depends_on: "heartbeat-mandatory-tests"
+
   - group: "Heartbeat Packaging"
     key: "heartbeat-packaging"
-    if: build.env("BUILDKITE_PULL_REQUEST") != "false"
-    depends_on:
-      - "heartbeat-mandatory-tests"
     steps:
       - label: ":ubuntu: Heartbeat Packaging Linux X86"
         key: "heartbeat-package-linux-x86"
         env:
           PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
           SNAPSHOT: true
-        command: "cd heartbeat && mage package"
+        command: |
+          cd heartbeat
+          mage package
         agents:
           provider: gcp
           image: "${IMAGE_UBUNTU_X86_64}"
           machineType: "${GCP_HI_PERF_MACHINE_TYPE}"
+        notify:
+          - github_commit_status:
+              context: "Heartbeat: Packaging Ubuntu x86_64"
 
       - label: ":linux: Heartbeat Packaging Linux ARM"
         key: "heartbeat-package-linux-arm"
@@ -188,8 +209,13 @@ steps:
           PLATFORMS: "linux/arm64"
           PACKAGES: "docker"
           SNAPSHOT: true
-        command: "cd heartbeat && mage package"
+        command: |
+          cd heartbeat
+          mage package
         agents:
           provider: "aws"
           imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
           instanceType: "${AWS_ARM_INSTANCE_TYPE}"
+        notify:
+          - github_commit_status:
+              context: "Heartbeat: Packaging Ubuntu ARM"