Add retry logic to skip around intermittant gerrit issue