diff options
| author |   xudan <xudan16@huawei.com> | 2018-10-25 04:03:23 -0400 |
|---|---|---|
| committer | xudan <xudan16@huawei.com> | 2018-10-31 00:12:34 -0400 |
| commit | 13a9eb11068987beec3c8d6e058142c07c8a66a6 (patch) | |
| tree | 3ac35fb1465451e90b4e28ae1853265a11b9d293 /dovetail/container.py | |
| parent | 7cd5c4c60b3f9a9893c2801a39061489ecfa6ae0 (diff) | |
CI verify jobs failed due to the update of tox
The LF pod used to run the CI verify jobs have updated the version of tox.
So the CI verify jobs failed.
See https://build.opnfv.org/ci/view/dovetail/job/dovetail-merge-master/476/console
Fix the python format errors
Ignore error 'W503 line break before binary operator'.
Change-Id: Ic2df070447bbea39c877ce7a394d733a95064bb1
Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'dovetail/container.py')
| -rw-r--r-- | dovetail/container.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/dovetail/container.py b/dovetail/container.py index 89c68ccb..be92a671 100644 --- a/dovetail/container.py +++ b/dovetail/container.py @@ -161,10 +161,9 @@ class Container(object): '{hosts_config} {openrc} {cacert_volume} {config_volume} ' \ '{result_volume} {images_volume} {docker_image} /bin/bash' \ .format(**locals()) - dt_utils.exec_cmd(cmd, cls.logger) - ret, container_id = \ - dt_utils.exec_cmd("sudo docker ps | grep " + docker_image + - " | awk '{print $1}' | head -1", cls.logger) + ret, container_id = dt_utils.exec_cmd(cmd, cls.logger) + if ret != 0: + return None cls.container_list[valid_type] = container_id if valid_type.lower() == 'vnftest': |