E2e tests has been flaky, with failfast and 2 scenarios tests are twice
as fragile. Any early failure of one of the scenarios cases second to be
canceled. Retryign always require running both scenarios.
Intead let's just wait as in other tests allowing us to retry
just the scenario that failed
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>