Skip to content

Commit

Permalink
Move back merged coverage report to build folder (#5799) (#6333)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>

* Fix the sonar step

Signed-off-by: Alexandros Sapranidis <[email protected]>

---------

Signed-off-by: Alexandros Sapranidis <[email protected]>
(cherry picked from commit fc05e0d)

Co-authored-by: Alexandros Sapranidis <[email protected]>
Co-authored-by: Yehor Shvedov <[email protected]>
  • Loading branch information
3 people authored Dec 17, 2024
1 parent 6b1d12a commit d77d9ee
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion .buildkite/scripts/steps/merge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit d77d9ee

Please sign in to comment.