Skip to content

Commit

Permalink
do-not-merge: testing ubuntu agent
Browse files Browse the repository at this point in the history
  • Loading branch information
oakrizan committed May 16, 2024
1 parent 2d43046 commit 9c8e6b7
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 35 deletions.
64 changes: 32 additions & 32 deletions .buildkite/filebeat/scripts/packaging/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,35 +15,35 @@ TARGET="observability-ci/${BEAT_NAME}"
echo "--- Creating package"
mage -d filebeat package

echo "--- Distribution list"
dir="filebeat/build/distributions"
buildkite-agent artifact upload "$dir/*.tar.gz;$dir/*.tar.gz.sha512"

echo "--- Docker image list"
docker images

define_tags
check_is_arm

echo "--- Tag & Push"
for variant in "${VARIANTS[@]}"; do
source="beats/${BEAT_NAME}${variant}"

for tag in "${tags[@]}"; do
targetTag=$tag${is_arm}

sourceName="${DOCKER_REGISTRY}/${source}:${SOURCE_TAG}"
targetName="${DOCKER_REGISTRY}/${TARGET}:${targetTag}"
# Remove following lines once beats fully migrated
targetName="${targetName}-buildkite"

if docker image inspect "${sourceName}" &>/dev/null; then
echo "Source name: $sourceName Target name: $targetName"
docker tag "$sourceName" "$targetName"
# docker push "$targetName"

else
echo "Docker image ${sourceName} does not exist"
fi
done
done
#echo "--- Distribution list"
#dir="filebeat/build/distributions"
#buildkite-agent artifact upload "$dir/*.tar.gz;$dir/*.tar.gz.sha512"
#
#echo "--- Docker image list"
#docker images
#
#define_tags
#check_is_arm
#
#echo "--- Tag & Push"
#for variant in "${VARIANTS[@]}"; do
# source="beats/${BEAT_NAME}${variant}"
#
# for tag in "${tags[@]}"; do
# targetTag=$tag${is_arm}
#
# sourceName="${DOCKER_REGISTRY}/${source}:${SOURCE_TAG}"
# targetName="${DOCKER_REGISTRY}/${TARGET}:${targetTag}"
# # Remove following lines once beats fully migrated
# targetName="${targetName}-buildkite"
#
# if docker image inspect "${sourceName}" &>/dev/null; then
# echo "Source name: $sourceName Target name: $targetName"
# docker tag "$sourceName" "$targetName"
## docker push "$targetName"
#
# else
# echo "Docker image ${sourceName} does not exist"
# fi
#done
#done
6 changes: 3 additions & 3 deletions .buildkite/scripts/define_module.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ getGitMatchingGroup() {

defineModule() {
cd "${BEAT_PATH}"
module=$(getGitMatchingGroup "$pattern" "$exclude")
NEW_MODULE=$(getGitMatchingGroup "$pattern" "$exclude")
if [ ! -f "$BEAT_PATH/module/${module}" ]; then
module=''
NEW_MODULE=''
fi
cd - >/dev/null

echo "${module}"
export NEW_MODULE
}
Binary file removed filebeat/filebeat_windows_amd64.syso
Binary file not shown.

0 comments on commit 9c8e6b7

Please sign in to comment.