From ed98d51f11f1a0b33a9b2d67d6e61568f6aec439 Mon Sep 17 00:00:00 2001
From: Shaunak Kashyap <ycombinator@gmail.com>
Date: Mon, 30 Sep 2024 15:16:52 -0700
Subject: [PATCH] [CI] Soft fail merge coverage reports step (#5586)

* Skip merge coverage reports step

* Add debugging echo

* Soft fail instead of skip

* Soft fail instead of skip
---
 .buildkite/pipeline.yml           | 2 ++
 .buildkite/scripts/steps/merge.sh | 1 +
 2 files changed, 3 insertions(+)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 174096fb28a..60cba8fc57a 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -176,6 +176,7 @@ steps:
       - unit-tests
       - extended-windows
     allow_dependency_failure: true
+    soft_fail: true # Until https://github.com/elastic/ingest-dev/issues/4042 is resolved
 
   - group: "K8s tests"
     key: "k8s-tests"
@@ -212,6 +213,7 @@ steps:
     retry:
       manual:
         allowed: true
+    soft_fail: true # Until https://github.com/elastic/ingest-dev/issues/4042 is resolved
 
   # Triggers a dynamic step: Sync K8s
   # Runs only on main and if k8s files are changed
diff --git a/.buildkite/scripts/steps/merge.sh b/.buildkite/scripts/steps/merge.sh
index 49b173a836b..bc7960419f9 100755
--- a/.buildkite/scripts/steps/merge.sh
+++ b/.buildkite/scripts/steps/merge.sh
@@ -4,6 +4,7 @@
 # Usage: merge.sh <step1> <step2> ... Where <step> is the id of the step that contains the coverage artifact.#  
 
 set -euo pipefail
+set -x # for debugging
 
 COV_ARTIFACT="coverage.out"
 MERGED_COV_FILE="build/TEST-go-unit.cov"