Commit 7b24f367 authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

fix_artifacts: still problem in creating pages.

parent c1c914f7

.gitlab-ci.yml

+5 −5
Original line number Diff line number Diff line
@@ -70,13 +70,13 @@ pages: 
    - 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

    - mv $MIDCSP_PATH/build/csp-lmc-mid_htmlcov/* public  

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

    - junitparser merge public/reports/csp-lmc_common-linting.xml public/reports/csp-lmc-mid-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

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

    - cd public

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

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

    - coverage xml

    - coverage html

  artifacts:

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/mid-csp-lmc_htmlcov; \

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

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

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

		mv /app/csp-lmc-mid_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/csp-lmc-mid-code-analysis.stdout; \

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



.PHONY: all test lint

csp-lmc-mid/setup.cfg

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ addopts = --cov=csp_lmc_mid 
          --cov-report=term 

          --cov-report=html 

          --cov-report=xml 

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

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

          -v

junit_family=legacy

filterwarnings =

csp-lmc-mid/setup.py

+1 −1
Original line number Diff line number Diff line
@@ -59,6 +59,6 @@ setup( 
            'pytest',

            'coverage',

            'pytest-json-report',

            'pycodestyle',

            'pycodestyle'

        ],

      )