MULTIARCH-5390: Reapply "Merge pull request #29808 from Prashanth684/4552-cvo-test"#29967

openshift-merge-bot[bot] merged 2 commits intoopenshift:mainopenshift/origin:mainfrom

Prashanth684:okd-cvo-test-fixPrashanth684/origin:okd-cvo-test-fixCopy head branch name to clipboard