Merge branch 'dbiryukov_follow_up_move_test_to_downstream_variables_mr-431833' into 'master'

Move a downstream variables expansion into the donwstream context

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141852



Merged-by: Albert Salim <asalim@gitlab.com>
Approved-by: Albert Salim <asalim@gitlab.com>
Co-authored-by: Dmytro Biryukov <dbiryukov@gitlab.com>