Bugfix: fix the CI failure for compass and joid 13/29513/6
authorhelenyao <yaohelan@huawei.com>
Wed, 1 Mar 2017 02:04:48 +0000 (21:04 -0500)
committerJose Lausuch <jose.lausuch@ericsson.com>
Wed, 1 Mar 2017 08:30:19 +0000 (08:30 +0000)
commita6b85aac58a5c6286ad1e91d587128e54f50c872
treee7b2354f41e84187bda038427b311fed55e3f813
parent672c39824631a873cbe80b2c90b694ff0d28e629
Bugfix: fix the CI failure for compass and joid

The bug was induced by [1]
1. the key try logic is added back
2. the logic of patch_config_file is updated as NoneType error was
thrown
3. refactored the patch_config_file to avoid calling the same function
twice on every type of POD. For non-aarch64, only calling the function
once is enough

[1] https://gerrit.opnfv.org/gerrit/#/c/28945/

Change-Id: I2e9fdc5ac3c04800cfc898ea654ff24e2bdeaef4
Signed-off-by: helenyao <yaohelan@huawei.com>
functest/ci/prepare_env.py