Commit c22d29bd authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

fix_artifacts: coverage combine does not generate a valid combined file. 

Use only the coverage-xml generated by csp-lmc-common module
parent bd0ee5d3

.gitlab-ci.yml

+6 −5
Original line number Diff line number Diff line
@@ -85,11 +85,12 @@ pages: 
    - junitparser merge public/reports/csp-lmc-common-linting.xml public/reports/csp-lmc-mid-linting.xml public/reports/linting.xml

    - rm public/reports/csp-lmc-common-unit-tests.xml public/reports/csp-lmc-mid-unit-tests.xml

    - rm public/reports/csp-lmc-common-linting.xml public/reports/csp-lmc-mid-linting.xml

    - cd public

    - coverage combine csp-lmc-common_coverage csp-lmc-mid_coverage

    - coverage xml -i

    - mv public/coverage.xml ./reports/code-coverage.xml

    #- cd public

    #- coverage combine csp-lmc-common_coverage csp-lmc-mid_coverage

    #- coverage xml -i

    # rename file because bagdges creation looks for code-coverage.xml file

    - mv coverage.xml ./reports/code-coverage.xml

    #- mv coverage.xml ./reports/code-coverage.xml

  artifacts:

    paths:

      - public

csp-lmc-common/docker/test-harness/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ test: 
        if [ -d /build ]; then \

                mv /app/setup_py_test.stdout /build/csp-lmc-common-setup-test.stdout; \

                mv /app/htmlcov /build/csp-lmc-common_htmlcov; \

                mv /app/csp-lmc-common_coverage /build; \

                mv /app/coverage.xml /build; \

                #mv /app/csp-lmc-common_coverage /build; \

        fi;

lint:

	pip3 install pylint2junit; \

csp-lmc-common/setup.cfg

+4 −2
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ test=pytest 
[coverage:run]

branch = True

source = csp-lmc-common

data_file = csp-lmc-common_coverage

#data_file = csp-lmc-common_coverage

#debug = dataio,dataop



[tool:pytest]

testpaths = tests
@@ -31,3 +32,4 @@ source-dir = docs 
build-dir = docs/_build

all_files = 1

builder = html

csp-lmc-mid/setup.cfg

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ test=pytest 
[coverage:run]

branch = True

source = csp-lmc-mid

data_file = csp-lmc-mid_coverage

#data_file = csp-lmc-mid_coverage



[tool:pytest]

testpaths = tests
@@ -17,7 +17,7 @@ addopts = --cov=csp_lmc_mid 
          --json-report-file=htmlcov/report.json 

          --cov-report=term 

          --cov-report=html 

          --cov-report=xml 

          #--cov-report=xml 

	  --junitxml=/build/reports/csp-lmc-mid-unit-tests.xml

          -v

junit_family=legacy