USER STORY

As an OpenShift developer, I want update the existing machine api e2e origin tests to work in a hybrid environment so that the tests do not fail for an invalid reason such as "node and machine counts do not match".

DESCRIPTION

Currently the origin tests for machine api are checking the node and machine counts and making sure they match.  In addition, they are also checking each node and expecting them to have machine labels on them.  In the case of our hybrid env tests, we will have at least one node that is a BM node that is not related to a machine CR.

Required

Tests must pass for hybrid env

Nice to have

A future task may be created to move these tests into machine api so that we do not need to continue touching origin for MAPI related tests.  We have created the new openshift test extension in the MAO project.  We could just move these tests over there.

ACCEPTANCE CRITERIA

All MAO / MAPI tests pass in hybrid environment