Support --option on upgrade tests to abort in progress#22726

openshift-merge-robot merged 1 commit intoopenshift:masteropenshift/origin:masterfrom

smarterclayton:disruptionsmarterclayton/origin:disruptionCopy head branch name to clipboard