diff --git a/.buildkite/filebeat/filebeat-pipeline.yml b/.buildkite/filebeat/filebeat-pipeline.yml index 329794de818d..38fa896d1cef 100644 --- a/.buildkite/filebeat/filebeat-pipeline.yml +++ b/.buildkite/filebeat/filebeat-pipeline.yml @@ -11,7 +11,7 @@ env: GCP_DEFAULT_MACHINE_TYPE: "c2d-highcpu-8" GCP_HI_PERF_MACHINE_TYPE: "c2d-highcpu-16" GCP_WIN_MACHINE_TYPE: "n2-standard-8" - AWS_ARM_INSTANCE_TYPE: "t4g.xlarge" + AWS_ARM_INSTANCE_TYPE: "m6g.xlarge" steps: - group: "Filebeat Mandatory Testing" diff --git a/.buildkite/hooks/post-checkout b/.buildkite/hooks/post-checkout index d33dd796328a..43881f6e2d82 100644 --- a/.buildkite/hooks/post-checkout +++ b/.buildkite/hooks/post-checkout @@ -30,8 +30,6 @@ checkout_merge() { git merge --abort exit ${merge_result} } - - git reset --hard "${pr_commit}" } pull_request="${BUILDKITE_PULL_REQUEST:-false}"