mirror of
https://github.com/isc-projects/bind9.git
synced 2026-06-11 07:49:59 -04:00
Merge branch '4246-remove-legacy-test-runner-from-ci-9.18' into 'bind-9.18'
[9.18] Use pytest runner for out-of-tree and OpenBSD system tests in CI See merge request isc-projects/bind9!8217
This commit is contained in:
commit
22de8654a5
2 changed files with 2 additions and 4 deletions
|
|
@ -395,7 +395,7 @@ cross-version-config-tests:
|
|||
<<: *default_triggering_rules
|
||||
stage: system
|
||||
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
|
||||
script:
|
||||
- *find_pytest
|
||||
|
|
@ -931,7 +931,6 @@ system:gcc:out-of-tree:
|
|||
artifacts: true
|
||||
<<: *base_image
|
||||
<<: *system_test_job
|
||||
<<: *system_test_legacy
|
||||
<<: *api_schedules_tags_triggers_web_triggering_rules
|
||||
|
||||
unit:gcc:out-of-tree:
|
||||
|
|
@ -1296,7 +1295,6 @@ clang:openbsd:amd64:
|
|||
system:clang:openbsd:amd64:
|
||||
<<: *openbsd_amd64_image
|
||||
<<: *system_test_job
|
||||
<<: *system_test_legacy
|
||||
<<: *api_schedules_triggers_web_triggering_rules
|
||||
variables:
|
||||
USER: gitlab-runner
|
||||
|
|
|
|||
|
|
@ -588,7 +588,7 @@ else:
|
|||
try:
|
||||
shell("get_core_dumps.sh", [system_test_dir.name])
|
||||
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}")
|
||||
|
||||
os.environ.update(env) # Ensure pytests have the same env vars as shell tests.
|
||||
|
|
|
|||
Loading…
Reference in a new issue