From 6907c129ad1b9c6acf6c8b0fa8adba2ef2993925 Mon Sep 17 00:00:00 2001
From: Olga Naidjonoka <olga_naidjonoka@epam.com>
Date: Thu, 1 Feb 2024 11:33:38 +0200
Subject: [PATCH] added image tag and push

---
 .buildkite/env-scripts/env.sh               | 22 +++++++++++++++++++
 .buildkite/env-scripts/linux-env.sh         |  8 +++----
 .buildkite/filebeat/filebeat-pipeline.yml   | 24 +++++++++++----------
 .buildkite/filebeat/scripts/package-step.sh |  5 +++--
 .buildkite/filebeat/scripts/package.sh      |  2 --
 5 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/.buildkite/env-scripts/env.sh b/.buildkite/env-scripts/env.sh
index d94d03aad53b..ce1c06a1a0f9 100644
--- a/.buildkite/env-scripts/env.sh
+++ b/.buildkite/env-scripts/env.sh
@@ -1,13 +1,35 @@
 #!/usr/bin/env bash
 
+source .buildkite/env-scripts/util.sh
+
+docs_changeset="^.*\.(asciidoc|md)$
+deploy/kubernetes/.*-kubernetes.yaml"
+packaging_changeset="^dev-tools/packaging/
+^.go-version"
+
+changeset_applies() {
+  local changeset=$1
+  if are_files_changed "$changeset"; then
+    echo true
+  else
+    echo false
+  fi
+}
+
 SETUP_GVM_VERSION="v0.5.1"
 WORKSPACE="$(pwd)"
 BIN="${WORKSPACE}/bin"
 HW_TYPE="$(uname -m)"
 PLATFORM_TYPE="$(uname)"
+ONLY_DOCS=$(changeset_applies "$docs_changeset")
+PACKAGING_CHANGES=$(changeset_applies "$packaging_changeset")
+GO_MOD_CHANGES=$(changeset_applies "^go.mod")
 
 export SETUP_GVM_VERSION
 export WORKSPACE
 export BIN
 export HW_TYPE
 export PLATFORM_TYPE
+export PACKAGING_CHANGES
+export ONLY_DOCS
+export GO_MOD_CHANGES
diff --git a/.buildkite/env-scripts/linux-env.sh b/.buildkite/env-scripts/linux-env.sh
index edaf1a3100c2..df73642b074c 100644
--- a/.buildkite/env-scripts/linux-env.sh
+++ b/.buildkite/env-scripts/linux-env.sh
@@ -18,7 +18,7 @@ if [[ $PLATFORM_TYPE == "Linux" ]]; then
   sudo apt-get install -y python3-venv
 fi
 
-echo ":: Setting up environment ::"
-add_bin_path
-with_go
-with_mage
+#echo ":: Setting up environment ::"
+#add_bin_path
+#with_go
+#with_mage
diff --git a/.buildkite/filebeat/filebeat-pipeline.yml b/.buildkite/filebeat/filebeat-pipeline.yml
index 7e4ba9180681..7285725bda96 100644
--- a/.buildkite/filebeat/filebeat-pipeline.yml
+++ b/.buildkite/filebeat/filebeat-pipeline.yml
@@ -7,6 +7,8 @@ env:
   IMAGE_WIN_2019: "family/core-windows-2019"
   IMAGE_WIN_2022: "family/core-windows-2022"
   IMAGE_MACOS_13: "generic-13-ventura-x64"
+  SETUP_MAGE_VERSION: "1.14.0"
+  ASDF_MAGE_VERSION: "1.14.0"
 
 steps:
   - group: "Filebeat Mandatory Testing"
@@ -21,9 +23,9 @@ steps:
           - github_commit_status:
               context: "Filebeat: Unit Tests"
         agents:
-          provider: "gcp"
-          image: "${IMAGE_UBUNTU_X86_64}"
-          machineType: "c2-standard-16"
+          provider: gcp
+          imageProject: elastic-images-qa
+          image: family/platform-ingest-eng-prod-base-ubuntu-2204
         artifact_paths:
           - "filebeat/build/*.xml"
           - "filebeat/build/*.json"
@@ -35,9 +37,9 @@ steps:
           - github_commit_status:
               context: "Filebeat: Integration Tests"
         agents:
-          provider: "gcp"
-          image: "${IMAGE_UBUNTU_X86_64}"
-          machineType: "c2-standard-16"
+          provider: gcp
+          imageProject: elastic-images-qa
+          image: family/platform-ingest-eng-prod-base-ubuntu-2204
         artifact_paths:
           - "filebeat/build/*.xml"
           - "filebeat/build/*.json"
@@ -49,9 +51,9 @@ steps:
           - github_commit_status:
               context: "Filebeat: Python Integration Tests"
         agents:
-          provider: "gcp"
-          image: "${IMAGE_UBUNTU_X86_64}"
-          machineType: "c2-standard-16"
+          provider: gcp
+          imageProject: elastic-images-qa
+          image: family/platform-ingest-eng-prod-base-ubuntu-2204
         artifact_paths:
           - "filebeat/build/*.xml"
           - "filebeat/build/*.json"
@@ -131,12 +133,12 @@ steps:
 
   - group: "Packaging"
     key: "packaging"
-    if: build.env("BUILDKITE_PULL_REQUEST") != "false"
     depends_on:
       - "mandatory-tests"
       - "extended-tests"
       - "extended-tests-win"
 
     steps:
-      - label: Package pipeline
+      - label: Mage Package
         commands: ".buildkite/filebeat/scripts/package-step.sh | buildkite-agent pipeline upload"
+        if: build.env("BUILDKITE_PULL_REQUEST") != "false"
diff --git a/.buildkite/filebeat/scripts/package-step.sh b/.buildkite/filebeat/scripts/package-step.sh
index a4127c3cd1d6..bd9ca52c5b09 100755
--- a/.buildkite/filebeat/scripts/package-step.sh
+++ b/.buildkite/filebeat/scripts/package-step.sh
@@ -25,8 +25,9 @@ if are_files_changed "$changeset"; then
           - github_commit_status:
               context: "Filebeat/Packaging: Linux X86"
         agents:
-          provider: "gcp"
-          image: "${IMAGE_UBUNTU_X86_64}"
+          provider: gcp
+          imageProject: elastic-images-qa
+          image: family/platform-ingest-eng-prod-base-ubuntu-2204
 
       - label: ":linux: Packaging Linux ARM"
         key: "package-linux-arm"
diff --git a/.buildkite/filebeat/scripts/package.sh b/.buildkite/filebeat/scripts/package.sh
index 2ae226eb739c..471a7e1d2dc4 100755
--- a/.buildkite/filebeat/scripts/package.sh
+++ b/.buildkite/filebeat/scripts/package.sh
@@ -4,8 +4,6 @@ set -euo pipefail
 
 source .buildkite/env-scripts/linux-env.sh
 
-echo ":: Evaluate Filebeat Changes ::"
-
 echo ":: Start Packaging ::"
 cd filebeat
 umask 0022