diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2dbeef1853..4c90de77da 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: