diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a32388f0c423b5244d84f85366a338c8d8c9e5f2..ef7291844c0db903946df08b6e2dda2a3908f444 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -443,7 +443,7 @@ external-renderer-pytest-on-merge-request: # run test - exit_code=0 - - python3 -m pytest -q --log-level ERROR -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer_be_comparison.py || exit_code=$? + - python3 -m pytest -q --log-level ERROR -n auto -rA --html=report.html --self-contained-html --junit-xml=report-junit.xml tests/renderer/test_renderer_be_comparison.py || exit_code=$? - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true - *merge-request-comparison-check @@ -456,6 +456,7 @@ external-renderer-pytest-on-merge-request: when: always paths: - report-junit.xml + - report.html expose_as: "pytest external renderer results" reports: junit: @@ -492,7 +493,7 @@ ivas-pytest-on-merge-request: ### run pytest - exit_code=0 - - python3 -m pytest tests -v --junit-xml=report-junit.xml || exit_code=$? + - python3 -m pytest tests -v --html=report.html --self-contained-html --junit-xml=report-junit.xml || exit_code=$? - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true - *merge-request-comparison-check @@ -505,6 +506,7 @@ ivas-pytest-on-merge-request: when: always paths: - report-junit.xml + - report.html expose_as: "pytest ivas results" reports: junit: @@ -537,7 +539,7 @@ evs-pytest-on-merge-request: ### run pytest for EVS cases - exit_code=0 - - python3 -m pytest tests/test_param_file.py -v --param_file scripts/config/self_test_evs.prm --junit-xml=report-junit-evs.xml || exit_code=$? + - python3 -m pytest tests/test_param_file.py -v --param_file scripts/config/self_test_evs.prm --html=report.html --self-contained-html --junit-xml=report-junit-evs.xml || exit_code=$? - zero_errors=$(cat report-junit-evs.xml | grep -c 'errors="0"') || true - *merge-request-comparison-check @@ -550,6 +552,7 @@ evs-pytest-on-merge-request: when: always paths: - report-junit-evs.xml + - report.html expose_as: "pytest evs results" reports: junit: @@ -691,7 +694,7 @@ codec-comparison-on-main-push: ### run pytest - exit_code=0 - - python3 -m pytest tests -v --junit-xml=report-junit.xml || exit_code=$? + - python3 -m pytest tests -v --html=report.html --self-contained-html --junit-xml=report-junit.xml || exit_code=$? - if [ $exit_code -eq 1 ] && [ $non_be_flag == 0 ]; then echo "pytest run had failures and non-BE flag not present"; exit $EXIT_CODE_FAIL; fi - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true - if [ $exit_code -eq 1 ] && [ $zero_errors == 1 ]; then echo "pytest run had failures, but no errors and non-BE flag present"; exit $EXIT_CODE_NON_BE; fi @@ -704,6 +707,7 @@ codec-comparison-on-main-push: when: always paths: - report-junit.xml + - report.html expose_as: "Results of comparison to previous merge commit" reports: junit: report-junit.xml diff --git a/pytest.ini b/pytest.ini index bb4169677b91c1a0dacdc4c363d17630c9a23354..0cb53d22bb924dd5867a455a30ba395c324a59b6 100644 --- a/pytest.ini +++ b/pytest.ini @@ -12,3 +12,5 @@ junit_family = xunit1 log_file_level = DEBUG log_format = %(asctime)s %(levelname)s %(message)s log_date_format = %Y-%m-%d %H:%M:%S +# for pytest-html report: do not log environment variables from the runners +environment_table_redact_list = .*