lava_helper/codecov_helper.py: Update artifact d/l paths after recent refactor
Make sure they're still downloaded to a single target dir, where the rest of
code expects them.
Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Change-Id: I3ab91d3c3f4238c7c0c2fabbd11c7ffd753b64fa
diff --git a/lava_helper/codecov_helper.py b/lava_helper/codecov_helper.py
index b56982f..33c0035 100644
--- a/lava_helper/codecov_helper.py
+++ b/lava_helper/codecov_helper.py
@@ -51,14 +51,14 @@
def dl_artifact(fname):
lava.fetch_file(
- metadata["build_job_url"] + "artifact/ci_build/spe/bin/" + fname,
- os.path.join(job_dir, fname)
+ metadata["build_job_url"] + "artifact/ci_build/" + fname,
+ os.path.join(job_dir, os.path.basename(fname))
)
_log.info("Producing coverage report for job %d", job_id)
- dl_artifact("bl2.axf")
- dl_artifact("tfm_s.axf")
- dl_artifact("tfm_ns.axf")
+ dl_artifact("spe/bin/bl2.axf")
+ dl_artifact("spe/bin/tfm_s.axf")
+ dl_artifact("nspe/bin/tfm_ns.axf")
run("python3 $SHARE_FOLDER/qa-tools/coverage-tool/coverage-reporting/intermediate_layer.py --config-json $SHARE_FOLDER/tf-m-ci-scripts/lava_helper/trace2covjson.json --local-workspace $SHARE_FOLDER", cwd=job_dir)
run("python3 $SHARE_FOLDER/qa-tools/coverage-tool/coverage-reporting/generate_info_file.py --workspace $SHARE_FOLDER --json covjson.json", cwd=job_dir)
# Remove sources, coverage of which we're not interested in (e.g.