Merge "Improve container support in tox.ini"

[transportpce.git] / tox.ini

diff --git a/tox.ini b/tox.ini
index e17c02dfca358df548f6c1dcc5d1acdd9082b335..303b01356a801c5583f958f867f8ce693c77ee56 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -131,31 +131,31 @@ setenv =
     USE_ODL_ALT_RMI_REGISTRY_PORT=1100
     USE_ODL_ALT_RMI_SERVER_PORT=44445
     USE_ODL_ALT_RESTCONF_PORT=8182
-    USE_ODL_ALT_KARAF_INSTALL_DIR=karaf121
+    USE_ODL_ALT_KARAF_INSTALL_DIR=karaf_hybrid
 commands =
 #  nosetests --with-xunit transportpce_tests/hybrid/test01_device_change_notifications.py
   ./launch_tests.sh hybrid {posargs:}
 
 [testenv:gnpy]
 depends = buildcontroller
-whitelist_externals = sh
-                      sudo
+whitelist_externals = launch_tests.sh
+                      dockercmd.sh
 passenv = LAUNCHER USE_LIGHTY
 commands =
   #sudo docker pull atriki/gnpyrest:v1.2
-  sudo docker run -d -p 8008:5000 --name gnpy_tpce_rest1 atriki/gnpyrest:v1.2
+  ./dockercmd.sh run -d -p 8008:5000 --name gnpy_tpce_rest1 atriki/gnpyrest:v1.2
   ./launch_tests.sh with_docker gnpy
-  sudo docker container rm -f gnpy_tpce_rest1
+  ./dockercmd.sh container rm -f gnpy_tpce_rest1
 
 [testenv:nbinotifications]
 depends = buildcontroller,sims221
-whitelist_externals = sh
-                      sudo
+whitelist_externals = launch_tests.sh
+                      dockercmd.sh
 passenv = LAUNCHER USE_LIGHTY
 commands =
-  sudo docker-compose -f ./nbinotifications/docker-compose.yml up -d
+  ./dockercmd.sh run -d -p 2181:2181 -p 9092:9092 --env ADVERTISED_LISTENERS=PLAINTEXT://localhost:9092 --name tpce_kafka1 teivah/kafka:2.0.0
   ./launch_tests.sh with_docker nbinotifications
-  sudo docker-compose -f ./nbinotifications/docker-compose.yml down --rmi all
+  ./dockercmd.sh container rm -f tpce_kafka1
 
 [testenv:docs]
 passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY