diff options
| author | IWASE Yusuke <iwase.yusuke0@gmail.com> | 2017-01-23 10:46:18 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2017-01-23 21:59:31 +0900 |
| commit | 1513ac9f95fa5c835c79b8509c94ac69096f0254 (patch) | |
| tree | f61d371e4800adc19bdd69134740b1fdba07cc64 | |
| parent | 9ccec7bb5aa9746e74d44bbf151ae18ac7ccdd06 (diff) | |
bgp_scenario_test: Clean previous builds before installing
On Python3 Docker image, "python setup.py install" might fail in case
that the current directory contains the symlink to Docker host file
system and the link target is not visible from container.
e.g.)
.tox/py34/include/python3.4m -> /usr/include/python3.4m
This patch fixes to remove .tox directory on Docker container and also
clean the previous builds before installing.
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | ryu/tests/integrated/common/docker_base.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ryu/tests/integrated/common/docker_base.py b/ryu/tests/integrated/common/docker_base.py index e2f9a985..6f7892db 100644 --- a/ryu/tests/integrated/common/docker_base.py +++ b/ryu/tests/integrated/common/docker_base.py @@ -210,6 +210,10 @@ class DockerImage(object): 'RUN apt-get update', '&& apt-get install -qy --no-install-recommends %s' % pkges, '&& cd %s' % workdir_ctn, + # Note: Clean previous builds, because "python setup.py install" + # might fail if the current directory contains the symlink to + # Docker host file systems. + '&& rm -rf *.egg-info/ build/ dist/ .tox/ *.log' '&& pip install -r tools/pip-requires -r tools/optional-requires', '&& python setup.py install', ]) |