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

fix_artifacts: try to combine coverage and linting outptut

parent 0557b2a8

.gitlab-ci.yml

+16 −4
Original line number Diff line number Diff line
@@ -62,11 +62,23 @@ clean shell runner: 
pages:

  stage: pages

  variables:

    BUILD_PATH: csp-lmc-common/docker

    COMMON_PATH: csp-lmc-common/docker

    MIDCSP_PATH: csp-lmc-mid/docker

  script:

    - pip3 install junitparser coverage     

    - ls -laR      

    - cp -R $BUILD_PATH/build public

    - mv $BUILD_PATH/build/htmlcov/* public  

    - cp -R $COMMON_PATH/build public

    - cp -R $MIDCSP_PATH/build public

    - mv $COMMON_PATH/build/csp-lmc-common_htmlcov/* public  

    - mv $MIDCSP_PATH/build/mid-csp-lmc_htmlcov/* public  

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

    - junitparser merge public/reports/csp-lmc_common-linting.xml public/reports/mid-csp-lmc-linting.xml public/reports/unit-tests.xml

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

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

    - cd public

    - coverage combine csp-lmc-common_coverage mid-csp-lmc_coverage

    - coverage xml

    - coverage html

  artifacts:

    paths:

      - public

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

+5 −5
Original line number Diff line number Diff line
@@ -21,15 +21,15 @@ test: 
	cd /app && python setup.py test | tee setup_py_test.stdout

	mkdir -p /build/reports && \

        if [ -d /build ]; then \

                mv /app/setup_py_test.stdout /build/csp_lmc_common_setup_test.stdout; \

                mv /app/htmlcov /build/htmlcov; \

                mv /app/coverage.xml /build/csp_lmc_common_coverage.xml; \

                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; \

        fi;

lint:

	pip3 install pylint2junit; \

        mkdir -p /build/reports; \

        cd /app && pylint --output-format=parseable csp_lmc_common | tee /build/csp_lmc_common_code_analysis.stdout; \

        cd /app && pylint --output-format=pylint2junit.JunitReporter csp_lmc_common > /build/reports/csp_lmc_common_linting.xml;

        cd /app && pylint --output-format=parseable csp_lmc_common | tee /build/csp_lmc_common-code-analysis.stdout; \

        cd /app && pylint --output-format=pylint2junit.JunitReporter csp_lmc_common > /build/reports/csp-lmc-common-linting.xml;



.PHONY: all test lint

csp-lmc-common/setup.cfg

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

branch = True

source = csp-lmc-common

data_file = csp-lmc-common_coverage



[tool:pytest]

testpaths = tests
@@ -18,7 +19,7 @@ addopts = --verbose 
          --cov-report=term 

          --cov-report=html 

          --cov-report=xml 

	  --junitxml=/build/reports/unit-tests.xml

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

console_output_style = progress

junit_family=legacy

filterwarnings =

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

+5 −5
Original line number Diff line number Diff line
@@ -21,14 +21,14 @@ test: 
	cd /app && python setup.py test | tee setup_py_test.stdout

	mkdir -p /build/reports && \

	if [ -d /build ]; then \

		mv /app/setup_py_test.stdout /build/mid_csp_lmc_setup_test.stdout; \

		mv /app/htmlcov /build/htmlcov; \

		mv /app/coverage.xml /build/mid_csp_lmc_coverage.xml; \

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

		mv /app/htmlcov /build/mid-csp-lmc_htmlcov; \

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

	fi;

lint:

	pip3 install pylint2junit; \

	mkdir -p /build/reports; \

	cd /app && pylint --output-format=parseable csp_lmc_mid | tee /build/mid_csp_lmc_code_analysis.stdout; \

	cd /app && pylint --output-format=pylint2junit.JunitReporter csp_lmc_mid > /build/reports/mid_csp_lmc_linting.xml;

	cd /app && pylint --output-format=parseable csp_lmc_mid | tee /build/mid-csp-lmc-code-analysis.stdout; \

	cd /app && pylint --output-format=pylint2junit.JunitReporter csp_lmc_mid > /build/reports/mid-csp-lmc-linting.xml;



.PHONY: all test lint

csp-lmc-mid/setup.cfg

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

branch = True

source = csp-lmc-mid

datafile = csp-lmc-mid_coverage

[tool:pytest]

testpaths = tests

addopts = --cov=csp_lmc_mid
@@ -16,7 +17,7 @@ addopts = --cov=csp_lmc_mid 
          --cov-report=term 

          --cov-report=html 

          --cov-report=xml 

	  --junitxml=/build/reports/unit-tests.xml

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

          -v

junit_family=legacy

filterwarnings =