summaryrefslogtreecommitdiffhomepage
path: root/.travis.yml
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2017-04-18 23:03:36 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2017-04-18 23:28:00 +0900
commitc2e7632397c2e49fdfb0f2b8e42d0321bf00c38d (patch)
tree61f9ab1f6fb2c6ea01d09089d958fe020cf57fdc /.travis.yml
parentc8cb20e75bb830f1a9fe1037356a4007faaba04d (diff)
Revert "test/lib/gobgp: Use local GoBGP executables in contaier"
This reverts commit 47ab84e34caeb7c89b26271bf84959011bc8ed19. using the same binaries on a host and inside a container isn't always feasible (by default, not statically linked binary). Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml7
1 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 44082883..2373248e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,8 @@ script: test/scenario_test/ci-scripts/travis-build-script.sh
env:
global:
- - DOCKER_IMAGE=osrg/quagga
+ - DOCKER_IMAGE=gobgp
+ - FROM_IMAGE=osrg/quagga
matrix:
allow_failures:
@@ -72,7 +73,7 @@ matrix:
services:
- docker
- env:
- - TEST=bgp_zebra_nht_test.py DOCKER_IMAGE=osrg/quagga:v1.0
+ - TEST=bgp_zebra_nht_test.py FROM_IMAGE=osrg/quagga:v1.0
sudo: required
services:
- docker
@@ -147,7 +148,7 @@ matrix:
services:
- docker
- env:
- - TEST=zapi_v3_test.py DOCKER_IMAGE=osrg/quagga:v1.0
+ - TEST=zapi_v3_test.py FROM_IMAGE=osrg/quagga:v1.0
sudo: required
services:
- docker