mirror of
https://github.com/isc-projects/bind9.git
synced 2026-05-28 04:34:54 -04:00
[9.20] fix: ci: Don't forward parent yaml variables to stress child pipelines
The global RUNNER_SCRIPT_TIMEOUT: 55m in the parent pipeline was being forwarded to the stress and tsan:stress child pipelines, where forwarded yaml variables outrank job-level variables. That caused stress jobs with BIND_STRESS_TESTS_RUN_TIME >= 60 to be killed at 55 minutes, regardless of the per-job RUNNER_SCRIPT_TIMEOUT set in the generated child config. Set forward:yaml_variables: false on both trigger jobs; the generated configs already declare every variable they need. Assisted-by: Claude:claude-opus-4-7 Backport of MR !12012 Merge branch 'backport-mnowak/fix-stress-test-script-timeout-9.20' into 'bind-9.20' See merge request isc-projects/bind9!12015
This commit is contained in:
commit
4b019c11c0
1 changed files with 19 additions and 0 deletions
|
|
@ -1816,6 +1816,17 @@ unit:clang:tsan:
|
|||
tsan:stress:
|
||||
<<: *default_triggering_rules
|
||||
stage: system
|
||||
# In a downstream pipeline, yaml variables inherited from the parent outrank
|
||||
# the child's job-level `variables:` block. Inherit only what the child
|
||||
# actually needs (image lookup), so the parent's RUNNER_SCRIPT_TIMEOUT does
|
||||
# not override the per-job values set in the generated child config.
|
||||
inherit:
|
||||
variables:
|
||||
- CI_REGISTRY_IMAGE
|
||||
- TSAN_OPTIONS_COMMON
|
||||
- TSAN_OPTIONS_DEBIAN
|
||||
- TSAN_OPTIONS_FEDORA
|
||||
- TSAN_SUPPRESSIONS
|
||||
variables:
|
||||
PARENT_PIPELINE_ID: $CI_PIPELINE_ID
|
||||
trigger:
|
||||
|
|
@ -2569,6 +2580,14 @@ shotgun:doh-get:
|
|||
stress-test-child-pipeline:
|
||||
<<: *default_triggering_rules
|
||||
stage: performance
|
||||
# In a downstream pipeline, yaml variables inherited from the parent outrank
|
||||
# the child's job-level `variables:` block. Inherit only what the child
|
||||
# actually needs (image lookup), so the parent's RUNNER_SCRIPT_TIMEOUT does
|
||||
# not override the per-job values set in the generated child config.
|
||||
inherit:
|
||||
variables:
|
||||
- CI_REGISTRY_IMAGE
|
||||
- CONFIGURE
|
||||
rules:
|
||||
- if: '$CI_MERGE_REQUEST_DIFF_BASE_SHA != null'
|
||||
changes:
|
||||
|
|
|
|||
Loading…
Reference in a new issue