From 9c8e6b7bdbe4f8423dbe9e8369fe6678f37f461e Mon Sep 17 00:00:00 2001 From: Olga Naidjonoka Date: Wed, 14 Feb 2024 15:34:06 +0200 Subject: [PATCH] do-not-merge: testing ubuntu agent --- .../filebeat/scripts/packaging/package.sh | 64 +++++++++--------- .buildkite/scripts/define_module.sh | 6 +- filebeat/filebeat_windows_amd64.syso | Bin 1072 -> 0 bytes 3 files changed, 35 insertions(+), 35 deletions(-) mode change 100644 => 100755 .buildkite/scripts/define_module.sh delete mode 100644 filebeat/filebeat_windows_amd64.syso diff --git a/.buildkite/filebeat/scripts/packaging/package.sh b/.buildkite/filebeat/scripts/packaging/package.sh index 44e91044576..f338e97c0b4 100755 --- a/.buildkite/filebeat/scripts/packaging/package.sh +++ b/.buildkite/filebeat/scripts/packaging/package.sh @@ -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 diff --git a/.buildkite/scripts/define_module.sh b/.buildkite/scripts/define_module.sh old mode 100644 new mode 100755 index 4e175ed9a52..d7187b58901 --- a/.buildkite/scripts/define_module.sh +++ b/.buildkite/scripts/define_module.sh @@ -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 } diff --git a/filebeat/filebeat_windows_amd64.syso b/filebeat/filebeat_windows_amd64.syso deleted file mode 100644 index c52af94f8e059275dff851e701e42fafefdf4132..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1072 zcmZvcPiqrV6vfY&fOb*nQd|w_QbN*yQBY7!i-l0dN^vLCB#i?x6Ot*k(1j~MPnT}| z7B2f8`VGY2dDEAF_$Kq-efOPr?!D)|N&jaewmS_v}vGgN)sxb-p=70Pf@Vy80h4-2mv0c}8F;8`(uk;7{gmt73I%a-Ee~9h& zyMFiA*=*`jn8z_p?z^g{h3EExcburyRJq0)!j@~K0nB5as{r~dV47Neq)R-B-huhf zGXP&|2EKRi$(g^_w)WLlrWV!?U|^3TYmq!ORo4LK(Bx;jLh;di~0fGJ>biqB-LT?#j`|Hx0ei~6oN+*`lHFHx{AzxVk%8;6vk~%W>futpr>sxm z&0($bd;zY777dhe8|f+dF1R5~qi`Y<;<>^htR)zq(yA|A)9HDr#EQ9QXO-$LH>1nA zJ&)Dlb|u`mirY8F5uULXtKIz vU72-VI_yjMVytfDT-<8unfw8NX4Q9SMjbx&h0c!a@6oNM<$r-Bc)a@`Kf{eH