Merge branch '429477-fix-flaky-patch-id-spec' into 'master'

Fix current_patch_id_sha spec to work with factory default

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



Merged-by: Piotr Skorupa <pskorupa@gitlab.com>
Approved-by: Jay McCure <jmccure@gitlab.com>
Approved-by: Piotr Skorupa <pskorupa@gitlab.com>
Co-authored-by: Patrick Bajao <ebajao@gitlab.com>