mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-03 15:55:46 +00:00
Code Issues Releases Wiki Activity

Merge branch 'cboltz-ci-artifacts' into 'master'

Browse Source 
Generate and keep html in utils coverage-regression

See merge request apparmor/apparmor!771

Acked-by: Georgia Garcia  <georgia.garcia@canonical.com>
This commit is contained in:
Christian Boltz
2021-07-13 18:07:29 +00:00
parent 12957eba4d 8d9e2489a2
commit bacfe785fe
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab-ci.yml
View File

@@ -1,7 +1,7 @@
--- ---
image: ubuntu:latest image: ubuntu:latest
before_script: before_script:
- export DEBIAN_FRONTEND=noninteractive && apt-get update -qq && apt-get install --no-install-recommends -y build-essential apache2-dev autoconf automake bison dejagnu flex libpam-dev libtool perl liblocale-gettext-perl pkg-config python-all-dev python3-all-dev pyflakes3 ruby-dev swig lsb-release python3-coverage python3-notify2 python3-psutil zlib1g-dev - export DEBIAN_FRONTEND=noninteractive && apt-get update -qq && apt-get install --no-install-recommends -y build-essential apache2-dev autoconf automake bison dejagnu flex libjs-jquery libjs-jquery-throttle-debounce libjs-jquery-isonscreen libjs-jquery-tablesorter libpam-dev libtool perl liblocale-gettext-perl pkg-config python-all-dev python3-all-dev pyflakes3 ruby-dev swig lsb-release python3-coverage python3-notify2 python3-psutil zlib1g-dev
- lsb_release -a - lsb_release -a
- uname -a - uname -a
@@ -46,6 +46,9 @@ test-all:
- make -C changehat/mod_apparmor check - make -C changehat/mod_apparmor check
- make -C profiles check-parser - make -C profiles check-parser
- make -C profiles check-abstractions.d - make -C profiles check-abstractions.d
artifacts:
paths:
- utils/test/htmlcov/
# Disabled due to aa-logprof dependency on /sbin/apparmor_parser existing # Disabled due to aa-logprof dependency on /sbin/apparmor_parser existing
# - make -C profiles check-profiles # - make -C profiles check-profiles

1
utils/test/Makefile
View File

@@ -96,6 +96,7 @@ coverage-report: .coverage
coverage-regression: .coverage coverage-regression: .coverage
$(PYTHON) -m coverage report --omit="$(COVERAGE_OMIT)" > coverage-report.txt $(PYTHON) -m coverage report --omit="$(COVERAGE_OMIT)" > coverage-report.txt
$(PYTHON) -m coverage html --omit="$(COVERAGE_OMIT)" $(HTML_COVR_ARGS)
cat coverage-report.txt cat coverage-report.txt
@echo 'Checking for coverage changes...' @echo 'Checking for coverage changes...'
@if grep -vE ' 100%$$|TOTAL|$(INCOMPLETE_COVERAGE)' coverage-report.txt |grep '%$$' ; then echo "ERROR: Coverage regression - the files listed above are expected to have 100% test coverage"; exit 1; fi @if grep -vE ' 100%$$|TOTAL|$(INCOMPLETE_COVERAGE)' coverage-report.txt |grep '%$$' ; then echo "ERROR: Coverage regression - the files listed above are expected to have 100% test coverage"; exit 1; fi