Master scheduler upgrade cleanup

[michaelgugino]

Master scheduler upgrade cleanup

This commit cleans up nested blocks which are hard
to read, gives names to all tasks so we can
debug the output better.

This commit also removes openshift.common.short_version
from predicate/priority lookup plugins as that data
may be stale.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1549971

[michaelgugino]

Currently, all these tasks are being skipped. I think this is a bug problem with import_role.

[vrutkovs]

/lgtm

[openshift-merge-robot]

/test all [submit-queue is verifying that this PR is safe to merge]

[michaelgugino]

/hold

[michaelgugino]

/hold cancel

[mtnbikenc]

/lgtm

[openshift-ci-robot]

@michaelgugino: The following tests failed, say /retest to rerun them all:

Test name	Commit	Details	Rerun command
ci/openshift-jenkins/extended_conformance_install_crio	56eaa15	link	/test crio
ci/openshift-jenkins/system-containers	56eaa15	link	/test system-containers
ci/openshift-jenkins/install	56eaa15	link	/test install

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

[sdodson]

/cherrypick release-3.9

[openshift-cherrypick-robot]

@sdodson: new pull request created: #7362

In response to this:

/cherrypick release-3.9

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.