From c884f19d1c8994638611c53c625757daa4ce44ae Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 18:13:29 +0300 Subject: [PATCH] [7.17](backport #38812) Clean BK scripts (#38817) This commit removes the need to configure git for Windows, since we migrated to the custom Windows images and removed the config_git, which was defined 2 times on the single file. Signed-off-by: Alexandros Sapranidis (cherry picked from commit 8051e6bf44877ce89fa75c6e2f456d2793dcce46) Signed-off-by: Alexandros Sapranidis Co-authored-by: Alexandros Sapranidis --- .buildkite/hooks/pre-command | 1 - .buildkite/scripts/common.sh | 7 ------- 2 files changed, 8 deletions(-) diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command index d1f9fc527ec2..d891b076fd49 100644 --- a/.buildkite/hooks/pre-command +++ b/.buildkite/hooks/pre-command @@ -32,7 +32,6 @@ if [[ "$BUILDKITE_PIPELINE_SLUG" == "beats" || "$BUILDKITE_PIPELINE_SLUG" == "fi with_mage fi - if [[ "$BUILDKITE_STEP_KEY" == *packaging* ]]; then DOCKER_USERNAME_SECRET=$(retry_with_count 5 vault kv get -field user "${DOCKER_REGISTRY_SECRET_PATH}") DOCKER_PASSWORD_SECRET=$(retry_with_count 5 vault kv get -field password "${DOCKER_REGISTRY_SECRET_PATH}") diff --git a/.buildkite/scripts/common.sh b/.buildkite/scripts/common.sh index ac5002dbf7ec..3cb32859aa08 100755 --- a/.buildkite/scripts/common.sh +++ b/.buildkite/scripts/common.sh @@ -470,13 +470,6 @@ are_conditions_met_packaging() { return 1 } -config_git() { - if [ -z "$(git config --get user.email)" ]; then - git config --global user.email "beatsmachine@users.noreply.github.com" - git config --global user.name "beatsmachine" - fi -} - defineModuleFromTheChangeSet() { # This method gathers the module name, if required, in order to run the ITs only if the changeset affects a specific module. # For such, it's required to look for changes under the module folder and exclude anything else such as asciidoc and png files.