* Fix infinite while loop on failure, reduce upgradecluster

* DRY code
Signed-off-by: Derek Nola <derek.nola@suse.com>