updated pr according to comments

elastic · Mar 19, 2024 · 60dce64 · 60dce64
1 parent f0b0e2e
commit 60dce64
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 198 deletions.
diff --git a/.buildkite/auditbeat/scripts/unit-tests-win.ps1 b/.buildkite/auditbeat/scripts/unit-tests-win.ps1
diff --git a/.buildkite/env-scripts/util.sh b/.buildkite/env-scripts/util.sh
@@ -9,7 +9,7 @@ add_bin_path() {
 }
 
 with_go() {
-    local go_version="${GOLANG_VERSION}"
+    local go_version="${GO_VERSION}"
     echo "Setting up the Go environment..."
     create_bin
     check_platform_architecture

diff --git a/.buildkite/filebeat/scripts/unit-tests-win.ps1 b/.buildkite/filebeat/scripts/unit-tests-win.ps1
diff --git a/.buildkite/heartbeat/scripts/unit-tests-win.ps1 b/.buildkite/heartbeat/scripts/unit-tests-win.ps1
diff --git a/.buildkite/scripts/packaging/package-util.sh b/.buildkite/scripts/packaging/package-util.sh
@@ -20,11 +20,3 @@ define_tags() {
     tags+=("${SOURCE_TAG}" "${aliasVersion}")
   fi
 }
-
-check_is_arm() {
-  if [[ ${HW_TYPE} == "aarch64" || ${HW_TYPE} == "arm64" ]]; then
-    is_arm="-arm64"
-  else
-    is_arm=""
-  fi
-}
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,39 @@ 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}"
+    #TODO Remove following line once beats fully migrated to Buildkite and Jenkins builds will be disabled
+    #Avoid clashing with the Jenkins produced images
+    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