Using osrg/ryu Docker image for the base image make it easy to build the image for the integrated tests, but the installed packages are remained on the site-packages unless they are explicitly uninstalled. This problem can cause the miss configured dependency when the requirment files are updated, for example.
This patch fixes to use Ubuntu:16.04, which is the default for the base image, and to build the test image on the clean environment. Signed-off-by: IWASE Yusuke <[email protected]> --- ryu/tests/integrated/bgp/base.py | 3 +-- ryu/tests/integrated/bgp/base_ip6.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ryu/tests/integrated/bgp/base.py b/ryu/tests/integrated/bgp/base.py index abcd914..8d4bb6f 100644 --- a/ryu/tests/integrated/bgp/base.py +++ b/ryu/tests/integrated/bgp/base.py @@ -38,8 +38,7 @@ class BgpSpeakerTestBase(unittest.TestCase): cls.bridges.append(cls.brdc1) cls.dockerimg = ctn_base.DockerImage() - cls.r_img = cls.dockerimg.create_ryu(image='osrg/ryu', - check_exist=True) + cls.r_img = cls.dockerimg.create_ryu(check_exist=True) cls.images.append(cls.r_img) cls.q_img = 'osrg/quagga' cls.images.append(cls.q_img) diff --git a/ryu/tests/integrated/bgp/base_ip6.py b/ryu/tests/integrated/bgp/base_ip6.py index 858a1ae..c68a273 100644 --- a/ryu/tests/integrated/bgp/base_ip6.py +++ b/ryu/tests/integrated/bgp/base_ip6.py @@ -38,8 +38,7 @@ class BgpSpeakerTestBase(unittest.TestCase): cls.bridges.append(cls.brdc1) cls.dockerimg = ctn_base.DockerImage() - cls.r_img = cls.dockerimg.create_ryu(image='osrg/ryu', - check_exist=True) + cls.r_img = cls.dockerimg.create_ryu(check_exist=True) cls.images.append(cls.r_img) cls.q_img = 'osrg/quagga' cls.images.append(cls.q_img) -- 2.7.4 ------------------------------------------------------------------------------ _______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
