test_vsctl: Use osrg/ryu-book image as Mininet container

This patch fixes test_vsctl.py to use osrg/ryu-book image as Mininet container and shortens the testing hours. Also, this patch removes the Dockerfile for building the Mininet Docker image. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
kaiqiwang4493 · Nov 18, 2016 · 156b3d2 · 156b3d2
1 parent fbda130
commit 156b3d2
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 30 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,6 @@ services:
 sudo: required  # Required to enable Docker service
 
 install:
-  - docker build -t ut_mininet ryu/tests/docker/mininet/
   - pip install tox coveralls
 
 script:

diff --git a/ryu/tests/docker/mininet/Dockerfile b/ryu/tests/docker/mininet/Dockerfile
diff --git a/ryu/tests/docker/mininet/ENTRYPOINT.sh b/ryu/tests/docker/mininet/ENTRYPOINT.sh
diff --git a/ryu/tests/unit/lib/ovs/test_vsctl.py b/ryu/tests/unit/lib/ovs/test_vsctl.py
@@ -27,7 +27,7 @@
 
 LOG = logging.getLogger(__name__)
 
-DOCKER_IMAGE_MININET = 'ut_mininet'
+DOCKER_IMAGE_MININET = 'osrg/ryu-book'
 
 OVSDB_MANAGER_ADDR = 'ptcp:6640'
 OVSDB_SWITCH_ADDR = 'tcp:%s:6640'