updated arm agent to v22

elastic · Mar 19, 2024 · 5443781 · 5443781
1 parent 4ee059a
commit 5443781
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 39 deletions.
diff --git a/.buildkite/env-scripts/env.sh b/.buildkite/env-scripts/env.sh
@@ -20,7 +20,6 @@ XPACK_MODULE_PATTERN="^x-pack\\/[a-z0-9]+beat\\/module\\/([^\\/]+)\\/.*"
 
 SETUP_GVM_VERSION="v0.5.1"
 ASDF_MAGE_VERSION="1.14.0"
-SETUP_MAGE_VERSION="1.14.0"
 SETUP_WIN_PYTHON_VERSION="3.11.0"
 
 # Docker & DockerHub
@@ -44,7 +43,6 @@ export XPACK_MODULE_PATTERN
 
 export SETUP_GVM_VERSION
 export ASDF_MAGE_VERSION
-export SETUP_MAGE_VERSION
 export SETUP_WIN_PYTHON_VERSION
 
 export DOCKER_COMPOSE_VERSION

diff --git a/.buildkite/filebeat/filebeat-pipeline.yml b/.buildkite/filebeat/filebeat-pipeline.yml
@@ -3,7 +3,7 @@
 env:
   BEATS_PROJECT_NAME: "filebeat"
   IMAGE_UBUNTU_X86_64: "family/platform-ingest-beats-ubuntu-2204"
-  AWS_IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2004-aarch64"
+  AWS_IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2204-aarch64"
   IMAGE_WIN_2016: "family/core-windows-2016"
   IMAGE_WIN_2019: "family/core-windows-2019"
   IMAGE_WIN_2022: "family/core-windows-2022"

diff --git a/.buildkite/scripts/packaging/package.sh b/.buildkite/scripts/packaging/package.sh
@@ -2,7 +2,7 @@
 
 set -euo pipefail
 
-source .buildkite/scripts/packaging/package-util.sh
+#source .buildkite/scripts/packaging/package-util.sh
 
 IMG_POSTFIX="-SNAPSHOT"
 VARIANTS=("" "-ubi" "-oss")
@@ -13,38 +13,38 @@ TARGET="observability-ci/${BEATS_PROJECT_NAME}"
 echo "--- Creating package"
 mage -d "${BEATS_PROJECT_NAME}" package
 
-echo "--- Distribution list"
-dir="${BEATS_PROJECT_NAME}/build/distributions"
-buildkite-agent artifact upload "$dir/*.tar.gz;$dir/*.tar.gz.sha512"
-
-echo "--- Docker image list"
-docker images
-
-define_tags
-
-targetSuffix=""
-if [[ ${HW_TYPE} == "aarch64" || ${HW_TYPE} == "arm64" ]]; then
-  targetSuffix="-arm64"
-fi
-
-for variant in "${VARIANTS[@]}"; do
-  source="beats/${BEATS_PROJECT_NAME}${variant}"
-
-  for tag in "${tags[@]}"; do
-    targetTag=$tag${targetSuffix}
-
-    sourceName="${DOCKER_REGISTRY}/${source}:${SOURCE_TAG}"
-    targetName="${DOCKER_REGISTRY}/${TARGET}:${targetTag}"
-    # Remove following line once beats fully migrated
-    targetName="${targetName}-buildkite"
-
-    if docker image inspect "${sourceName}" &>/dev/null; then
-      echo "--- Tag & Push with target: $targetName"
-      echo "Source name: $sourceName"
-      docker tag "$sourceName" "$targetName"
-      docker push "$targetName"
-    else
-      echo "Docker image ${sourceName} does not exist"
-    fi
-  done
-done
+#echo "--- Distribution list"
+#dir="${BEATS_PROJECT_NAME}/build/distributions"
+#buildkite-agent artifact upload "$dir/*.tar.gz;$dir/*.tar.gz.sha512"
+#
+#echo "--- Docker image list"
+#docker images
+#
+#define_tags
+#
+#targetSuffix=""
+#if [[ ${HW_TYPE} == "aarch64" || ${HW_TYPE} == "arm64" ]]; then
+#  targetSuffix="-arm64"
+#fi
+#
+#for variant in "${VARIANTS[@]}"; do
+#  source="beats/${BEATS_PROJECT_NAME}${variant}"
+#
+#  for tag in "${tags[@]}"; do
+#    targetTag=$tag${targetSuffix}
+#
+#    sourceName="${DOCKER_REGISTRY}/${source}:${SOURCE_TAG}"
+#    targetName="${DOCKER_REGISTRY}/${TARGET}:${targetTag}"
+#    # Remove following line once beats fully migrated
+#    targetName="${targetName}-buildkite"
+#
+#    if docker image inspect "${sourceName}" &>/dev/null; then
+#      echo "--- Tag & Push with target: $targetName"
+#      echo "Source name: $sourceName"
+#      docker tag "$sourceName" "$targetName"
+#      docker push "$targetName"
+#    else
+#      echo "Docker image ${sourceName} does not exist"
+#    fi
+#  done
+#done