Merge "update ci pod in the test suite according to Fraser"