openstack
/
os-ken
Code Issues Proposed changes

integrated/bgp: Use Ubuntu:16.04 for base image 

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 <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
IWASE Yusuke 2016-11-16 15:03:55 +09:00 committed by FUJITA Tomonori
parent 5c7129563d
commit 33ecea2dd6
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ryu/tests/integrated/bgp/base.py
View File

@ -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)

3
ryu/tests/integrated/bgp/base_ip6.py
View File

@ -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)