Fix pipeline failures

What does this MR do and why?

Fix pipeline failures.

Related upstream commits:

https://gitlab.com/gitlab-org/gitlab/-/commit/b59b8bc23ef72424acac676ada8204ddb1ff1ec7

https://gitlab.com/gitlab-org/gitlab/-/commit/f21ca69cfe97f5ba4dfde409382de343da3d5ffe

Screenshots or screen recordings

Screenshots are required for UI changes, and strongly recommended for all other merge requests.

Before	After

How to set up and validate locally

Numbered steps to set up and validate the change are strongly suggested.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

• I have evaluated the MR acceptance checklist for this MR.