mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

Merge branch '4246-remove-legacy-test-runner-from-ci' into 'main'

Browse Source 
Use pytest runner for out-of-tree and OpenBSD system tests in CI

Closes #4246

See merge request isc-projects/bind9!8193
This commit is contained in:
Tom Krizek
2023-08-21 13:13:33 +00:00
parent f9657267af b1a9d1fe25
commit f52dd73cac
2 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
.gitlab-ci.yml
View File

@@ -393,7 +393,7 @@ cross-version-config-tests:
<<: *default_triggering_rules <<: *default_triggering_rules
stage: system stage: system
before_script: before_script:
- test -n "${OUT_OF_TREE_WORKSPACE}" && cd "${OUT_OF_TREE_WORKSPACE}" - test -n "${OUT_OF_TREE_WORKSPACE}" && cp -r bin/tests/system/* "${OUT_OF_TREE_WORKSPACE}/bin/tests/system/" && cd "${OUT_OF_TREE_WORKSPACE}"
- *setup_interfaces - *setup_interfaces
script: script:
- *find_pytest - *find_pytest
@@ -404,22 +404,6 @@ cross-version-config-tests:
after_script: after_script:
- *display_pytest_failures - *display_pytest_failures
.system_test_legacy: &system_test_legacy
script:
- cd bin/tests/system
- make -j${TEST_PARALLEL_JOBS:-1} -k check V=1
- if git rev-parse > /dev/null 2>&1; then ( ! grep "^I:.*:file.*not removed$" *.log ); fi
- '( ! grep -F "grep: warning:" *.log )'
after_script:
- test -d bind-* && cd bind-*
- REALSOURCEDIR="$PWD"
- test -n "${OUT_OF_TREE_WORKSPACE}" && cd "${OUT_OF_TREE_WORKSPACE}"
- cat bin/tests/system/test-suite.log
- find bin/tests/system -name "*dig.*" | xargs grep "error" || true
- *find_python
- >
"$PYTHON" "$REALSOURCEDIR"/bin/tests/convert-trs-to-junit.py . > "$CI_PROJECT_DIR"/junit.xml
.system_test: &system_test_job .system_test: &system_test_job
<<: *system_test_common <<: *system_test_common
artifacts: artifacts:
@@ -953,7 +937,6 @@ system:gcc:out-of-tree:
artifacts: true artifacts: true
<<: *base_image <<: *base_image
<<: *system_test_job <<: *system_test_job
<<: *system_test_legacy
<<: *api_schedules_tags_triggers_web_triggering_rules <<: *api_schedules_tags_triggers_web_triggering_rules
unit:gcc:out-of-tree: unit:gcc:out-of-tree:
@@ -1291,7 +1274,6 @@ clang:openbsd:amd64:
system:clang:openbsd:amd64: system:clang:openbsd:amd64:
<<: *openbsd_amd64_image <<: *openbsd_amd64_image
<<: *system_test_job <<: *system_test_job
<<: *system_test_legacy
<<: *api_schedules_triggers_web_triggering_rules <<: *api_schedules_triggers_web_triggering_rules
variables: variables:
USER: gitlab-runner USER: gitlab-runner

2
bin/tests/system/conftest.py
View File

@@ -587,7 +587,7 @@ else:
try: try:
shell("get_core_dumps.sh", [system_test_dir.name]) shell("get_core_dumps.sh", [system_test_dir.name])
except subprocess.CalledProcessError as exc: except subprocess.CalledProcessError as exc:
mlogger.error("Found core dumps") mlogger.error("Found core dumps or sanitizer reports")
pytest.fail(f"get_core_dumps.sh exited with {exc.returncode}") pytest.fail(f"get_core_dumps.sh exited with {exc.returncode}")
os.environ.update(env) # Ensure pytests have the same env vars as shell tests. os.environ.update(env) # Ensure pytests have the same env vars as shell tests.