Merge branch '500960-fix-flaky-spec' into 'master'

Fix flaky spec

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



Merged-by: Siddharth Dungarwal <sdungarwal@gitlab.com>
Approved-by: Arturo Herrero <arturo.herrero@gmail.com>
Approved-by: Ravi Kumar <rkumar@gitlab.com>