Simplify test and add wait and retry logics
What does this MR do?
To address failures:
Also to simplify/optimize this test. One of the thing to notice is I noticed a new behavior (merge train could failed if starts right after MR pipeline just finishes, reported here #321001 (closed)) so I add a work around to help test pass until the issue is sorted out , hopefully during re-architect #300042 (closed).
Does this MR meet the acceptance criteria?
Conformity
Edited by Zeff Morgan