From d77d9ee0207cc2fe953f50945678560cbf87fdab Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 17 Dec 2024 20:21:02 +0200 Subject: [PATCH] Move back merged coverage report to build folder (#5799) (#6333) * Move back merged coverage report to build folder A recent commit change the generate coverage report file location and moved it from the `/build` to the root of the repo. This had a side effect on the Sonar scanning step that expected the file to be on the `/build` folder Closes: https://github.com/elastic/ingest-dev/issues/4258 Signed-off-by: Alexandros Sapranidis * Fix the sonar step Signed-off-by: Alexandros Sapranidis --------- Signed-off-by: Alexandros Sapranidis (cherry picked from commit fc05e0d172ec2667a21cc4e3951d3eaabf55dd25) Co-authored-by: Alexandros Sapranidis Co-authored-by: Yehor Shvedov <146825775+ev1yehor@users.noreply.github.com> --- .buildkite/pipeline.yml | 4 ++-- .buildkite/scripts/steps/merge.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index f19781e327a..a2c1dc27f67 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -188,7 +188,7 @@ steps: command: | .buildkite/scripts/steps/merge.sh artifact_paths: - - "TEST-go-unit.cov" + - "build/TEST-go-unit.cov" agents: image: "golang:1.22.6" depends_on: @@ -225,7 +225,7 @@ steps: agents: image: "docker.elastic.co/cloud-ci/sonarqube/buildkite-scanner:latest" command: - - "buildkite-agent artifact download --step merge-coverage TEST-go-unit.cov ." + - "buildkite-agent artifact download --step merge-coverage build/TEST-go-unit.cov ." - "/scan-source-code.sh" depends_on: - "merge-coverage" diff --git a/.buildkite/scripts/steps/merge.sh b/.buildkite/scripts/steps/merge.sh index 2382634d074..22b310deffb 100755 --- a/.buildkite/scripts/steps/merge.sh +++ b/.buildkite/scripts/steps/merge.sh @@ -5,7 +5,8 @@ set -euo pipefail set -x # for debugging -MERGED_COV_FILE="TEST-go-unit.cov" +mkdir -p build +MERGED_COV_FILE="build/TEST-go-unit.cov" go install github.com/wadey/gocovmerge@latest