shixiong/okd @ 08e4336a22eda25078bcb88e2fbea1f010a15dbf

OpenShift Merge Robot 291f9ba211 Merge pull request #11434 from patrickdillon/clean-up-test		%!s(int64=6) %!d(string=hai) anos
..
aws	a49f6e73f7 Move repo setup into test.	%!s(int64=6) %!d(string=hai) anos
tox-inventory.txt	ed0210b2d5 Clean up tests	%!s(int64=6) %!d(string=hai) anos
tox-inventory.txt_extras	3a14ee697a Fix container_runtime openshift_containerized_host_groups	%!s(int64=7) %!d(string=hai) anos