Skip to content

Commit

Permalink
[8.13](backport #38736) Fix the dynamic step for pipeline upload on t…
Browse files Browse the repository at this point in the history
…he x-pack Heartbeat (#38738)

Fix unbound BEATS_PROJECT_NAME

Signed-off-by: Alexandros Sapranidis <alexandros@elastic.co>
(cherry picked from commit a455d05)

Co-authored-by: Alexandros Sapranidis <alexandros@elastic.co>
  • Loading branch information
mergify[bot] and alexsapran authored May 2, 2024
1 parent ad3991a commit 765102f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .buildkite/scripts/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ case "${BUILDKITE_PIPELINE_SLUG}" in
esac

check_and_set_beat_vars() {
if [[ -n "$BEATS_PROJECT_NAME" && "$BEATS_PROJECT_NAME" == *"x-pack/"* ]]; then
local BEATS_PROJECT_NAME=${BEATS_PROJECT_NAME:=""}
if [[ "${BEATS_PROJECT_NAME:=""}" == *"x-pack/"* ]]; then
BEATS_XPACK_PROJECT_NAME=${BEATS_PROJECT_NAME//-/} #remove -
BEATS_XPACK_PROJECT_NAME=${BEATS_XPACK_PROJECT_NAME//\//_} #replace / to _
BEATS_XPACK_LABEL_PROJECT_NAME=${BEATS_PROJECT_NAME//\//-} #replace / to - for labels
Expand Down
1 change: 0 additions & 1 deletion .buildkite/x-pack/pipeline.xpack.heartbeat.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
name: "beats-xpack-heartbeat"


env:
AWS_ARM_INSTANCE_TYPE: "t4g.xlarge"

Expand Down

0 comments on commit 765102f

Please sign in to comment.