From c3166ff5a440993b99db505b54a8837a0b3cf732 Mon Sep 17 00:00:00 2001
From: Jithu Murugan <j.murugan@fz-juelich.de>
Date: Mon, 24 Feb 2025 17:55:58 +0100
Subject: [PATCH] - coverage combine cannot process Cobertura files. Therefore,
merge the .coverage folder individually to prevent failures when combining
the coverage results.
---
.gitlab-ci.yml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 003ac77..6bf7c32 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,14 +34,14 @@ unit_tests:
image: ubuntu:22.04
script:
- coverage run -m pytest -s --tb=short --junitxml=test-results.xml ./dedal/tests/unit_tests
- - coverage xml -o coverage_unit.xml
+ - mv .coverage .coverage.unit # Rename to avoid overwriting
artifacts:
when: always
reports:
junit: test-results.xml
paths:
- test-results.xml
- - coverage_unit.xml
+ - .coverage.unit
expire_in: 1 week
integration_tests:
@@ -51,7 +51,7 @@ integration_tests:
image: ubuntu:22.04
script:
- coverage run -m pytest -s --tb=short --junitxml=test-results.xml ./dedal/tests/integration_tests
- - coverage xml -o coverage_integration.xml
+ - mv .coverage .coverage.integration # Rename to avoid overwriting
needs: ["unit_tests"]
artifacts:
when: always
@@ -59,7 +59,7 @@ integration_tests:
junit: test-results.xml
paths:
- test-results.xml
- - coverage_integration.xml
+ - .coverage.integration
expire_in: 1 week
merge_coverage:
@@ -68,7 +68,7 @@ merge_coverage:
- docker-runner
image: ubuntu:22.04
script:
- - coverage combine coverage_unit.xml coverage_integration.xml
+ - coverage combine .coverage.unit .coverage.integration
- coverage report
- coverage xml -o coverage.xml
- coverage html -d coverage_html
--
GitLab