Merge branch 'cherry-pick-39e65e61' into '15-5-stable-ee'

Merge branch 'sh-fix-flaky-pipelines-spec' into 'master'

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



Merged-by: John Skarbek <jskarbek@gitlab.com>
Approved-by: Mayra Cabrera <mcabrera@gitlab.com>
Co-authored-by: Rémy Coutable <remy@rymai.me>