From f5b41ab62354cba260bab26cde7c275f4ef3cc9e Mon Sep 17 00:00:00 2001
From: Olga Naidjonoka <olga_naidjonoka@epam.com>
Date: Wed, 24 Jan 2024 10:35:51 +0200
Subject: [PATCH] enabled synamic packaging step

---
 .buildkite/auditbeat/auditbeat-pipeline.yml  | 62 ++++++++++----------
 .buildkite/auditbeat/scripts/package-step.sh |  7 ++-
 .buildkite/auditbeat/scripts/package.sh      |  3 +-
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/.buildkite/auditbeat/auditbeat-pipeline.yml b/.buildkite/auditbeat/auditbeat-pipeline.yml
index 902f4e2dfd43..44dec0ddcd3a 100644
--- a/.buildkite/auditbeat/auditbeat-pipeline.yml
+++ b/.buildkite/auditbeat/auditbeat-pipeline.yml
@@ -134,37 +134,35 @@ steps:
 #      - "extended-tests-win"
 
     steps:
-#      - label: Package pipeline
+      - label: Package pipeline
+        commands: ".buildkite/auditbeat/scripts/package-step.sh | buildkite-agent pipeline upload"
+
+#      - label: ":ubuntu: Packaging Linux X86"
+#        key: "package-linux-x86"
 #        env:
 #          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
-#        commands: ".buildkite/auditbeat/scripts/package-step.sh | buildkite-agent pipeline upload"
-
-      - label: ":ubuntu: Packaging Linux X86"
-        key: "package-linux-x86"
-        env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
-        command:
-          - ".buildkite/auditbeat/scripts/package.sh"
-        notify:
-          - github_commit_status:
-              context: "auditbeat/Packaging: Linux X86"
-        agents:
-          provider: "gcp"
-          image: "${IMAGE_UBUNTU_X86_64}"
-
-      - label: ":linux: Packaging Linux ARM"
-        key: "package-linux-arm"
-        env:
-          PLATFORMS: "linux/arm64"
-          PACKAGES: "docker"
-        command:
-          - ".buildkite/auditbeat/scripts/package.sh"
-        notify:
-          - github_commit_status:
-              context: "auditbeat/Packaging: Linux ARM"
-        agents:
-          provider: "aws"
-          imagePrefix: "${IMAGE_UBUNTU_ARM_64}"
-          instanceType: "t4g.large"
-        artifact_paths:
-          - "auditbeat/build/distributions/*.tar.gz"
+#        command:
+#          - ".buildkite/auditbeat/scripts/package.sh"
+#        notify:
+#          - github_commit_status:
+#              context: "auditbeat/Packaging: Linux X86"
+#        agents:
+#          provider: "gcp"
+#          image: "${IMAGE_UBUNTU_X86_64}"
+#
+#      - label: ":linux: Packaging Linux ARM"
+#        key: "package-linux-arm"
+#        env:
+#          PLATFORMS: "linux/arm64"
+#          PACKAGES: "docker"
+#        command:
+#          - ".buildkite/auditbeat/scripts/package.sh"
+#        notify:
+#          - github_commit_status:
+#              context: "auditbeat/Packaging: Linux ARM"
+#        agents:
+#          provider: "aws"
+#          imagePrefix: "${IMAGE_UBUNTU_ARM_64}"
+#          instanceType: "t4g.large"
+#        artifact_paths:
+#          - "auditbeat/build/distributions/*.tar.gz"
diff --git a/.buildkite/auditbeat/scripts/package-step.sh b/.buildkite/auditbeat/scripts/package-step.sh
index 269b4058c40e..8b348bafa713 100755
--- a/.buildkite/auditbeat/scripts/package-step.sh
+++ b/.buildkite/auditbeat/scripts/package-step.sh
@@ -17,11 +17,13 @@ if are_files_changed "$changeset"; then
     steps:
       - label: ":ubuntu: Packaging Linux X86"
         key: "package-linux-x86"
+        env:
+          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
         command:
           - ".buildkite/auditbeat/scripts/package.sh"
         notify:
           - github_commit_status:
-              context: "auditbeat/Packaging: Linux X86"
+              context: "Auditbeat/Packaging: Linux X86"
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -35,11 +37,10 @@ if are_files_changed "$changeset"; then
           - ".buildkite/auditbeat/scripts/package.sh"
         notify:
           - github_commit_status:
-              context: "auditbeat/Packaging: Linux ARM"
+              context: "Auditbeat/Packaging: ARM"
         agents:
           provider: "aws"
           imagePrefix: "${IMAGE_UBUNTU_ARM_64}"
           instanceType: "t4g.large"
 EOF
 fi
-
diff --git a/.buildkite/auditbeat/scripts/package.sh b/.buildkite/auditbeat/scripts/package.sh
index 868897e54717..eb0553bcab71 100755
--- a/.buildkite/auditbeat/scripts/package.sh
+++ b/.buildkite/auditbeat/scripts/package.sh
@@ -4,7 +4,8 @@ set -euo pipefail
 
 source .buildkite/env-scripts/unix-env.sh
 
-echo ":: Evaluate Auditbeat Changes ::"
+echo ":: Docker Version ::"
+docker --version
 
 echo ":: Start Packaging ::"
 cd auditbeat