Fix test

What does this MR do and why?

fix https://gitlab.com/gitlab-org/gitlab/-/merge_requests/152630

fix https://gitlab.com/gitlab-org/gitlab/-/merge_requests/152110

skip upstream failed test due to https://gitlab.com/gitlab-org/gitlab/-/merge_requests/150486, will unskip after upstream pipeline pass