updated step script (#37935)

elastic · Feb 9, 2024 · 4fb9611 · 4fb9611
1 parent d0519f6
commit 4fb9611
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/.buildkite/auditbeat/auditbeat-pipeline.yml b/.buildkite/auditbeat/auditbeat-pipeline.yml
@@ -134,4 +134,4 @@ steps:
 
     steps:
       - label: Package pipeline
-        commands: ".buildkite/auditbeat/scripts/package-step.sh | buildkite-agent pipeline upload"
+        commands: ".buildkite/auditbeat/scripts/package-step.sh"
diff --git a/.buildkite/auditbeat/scripts/package-step.sh b/.buildkite/auditbeat/scripts/package-step.sh
@@ -13,7 +13,7 @@ changeset="^auditbeat/
 ^\.buildkite/auditbeat/"
 
 if are_files_changed "$changeset"; then
-  cat <<-YAML
+  bk_pipeline=$(cat <<-YAML
     steps:
       - label: ":ubuntu: Packaging Linux X86"
         key: "package-linux-x86"
@@ -43,6 +43,8 @@ if are_files_changed "$changeset"; then
           imagePrefix: "${IMAGE_UBUNTU_ARM_64}"
           instanceType: "t4g.large"
 YAML
+)
+  echo "${bk_pipeline}" | buildkite-agent pipeline upload
 else
   buildkite-agent annotate "No required files changed. Skipped packaging" --style 'warning' --context 'ctx-warning'
   exit 0

diff --git a/.buildkite/filebeat/filebeat-pipeline.yml b/.buildkite/filebeat/filebeat-pipeline.yml
@@ -137,4 +137,4 @@ steps:
 
     steps:
       - label: Package pipeline
-        commands: ".buildkite/filebeat/scripts/package-step.sh | buildkite-agent pipeline upload"
+        commands: ".buildkite/filebeat/scripts/package-step.sh"
diff --git a/.buildkite/filebeat/scripts/package-step.sh b/.buildkite/filebeat/scripts/package-step.sh
@@ -13,7 +13,7 @@ changeset="^filebeat/
 ^\.buildkite/filebeat/"
 
 if are_files_changed "$changeset"; then
-  cat <<-YAML
+  bk_pipeline=$(cat <<-YAML
     steps:
       - label: ":ubuntu: Packaging Linux X86"
         key: "package-linux-x86"
@@ -43,6 +43,8 @@ if are_files_changed "$changeset"; then
           imagePrefix: "${IMAGE_UBUNTU_ARM_64}"
           instanceType: "t4g.large"
 YAML
+)
+  echo "${bk_pipeline}" | buildkite-agent pipeline upload
 else
   buildkite-agent annotate "No required files changed. Skipped packaging" --style 'warning' --context 'ctx-warning'
   exit 0

diff --git a/.buildkite/heartbeat/heartbeat-pipeline.yml b/.buildkite/heartbeat/heartbeat-pipeline.yml
@@ -139,4 +139,4 @@ steps:
 
     steps:
       - label: Package pipeline
-        commands: ".buildkite/heartbeat/scripts/package-step.sh | buildkite-agent pipeline upload"
+        commands: ".buildkite/heartbeat/scripts/package-step.sh"
diff --git a/.buildkite/heartbeat/scripts/package-step.sh b/.buildkite/heartbeat/scripts/package-step.sh
@@ -13,7 +13,7 @@ changeset="^heartbeat/
 ^\.buildkite/heartbeat/"
 
 if are_files_changed "$changeset"; then
-  cat <<-YAML
+  bk_pipeline=$(cat <<-YAML
     steps:
       - label: ":ubuntu: Packaging Linux X86"
         key: "package-linux-x86"
@@ -43,6 +43,8 @@ if are_files_changed "$changeset"; then
           imagePrefix: "${IMAGE_UBUNTU_ARM_64}"
           instanceType: "t4g.large"
 YAML
+)
+  echo "${bk_pipeline}" | buildkite-agent pipeline upload
 else
   buildkite-agent annotate "No required files changed. Skipped packaging" --style 'warning' --context 'ctx-warning'
   exit 0