From c3a98ef9475e9ce8ec866978df75394c3df639bf Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Tue, 6 Jul 2021 09:26:31 +0200 Subject: [PATCH] Reenforce Lighty use in the gate Signed-off-by: guillaume.lambert Change-Id: I92e51984822ae392ae80d9f6e0814bcb049b9cef --- .../{test_gnpy.py => test01_gnpy.py} | 0 ...ications.py => test02_nbinotifications.py} | 0 tox.ini | 26 +++++++++++-------- 3 files changed, 15 insertions(+), 11 deletions(-) rename tests/transportpce_tests/with_docker/{test_gnpy.py => test01_gnpy.py} (100%) rename tests/transportpce_tests/with_docker/{test_nbinotifications.py => test02_nbinotifications.py} (100%) diff --git a/tests/transportpce_tests/with_docker/test_gnpy.py b/tests/transportpce_tests/with_docker/test01_gnpy.py similarity index 100% rename from tests/transportpce_tests/with_docker/test_gnpy.py rename to tests/transportpce_tests/with_docker/test01_gnpy.py diff --git a/tests/transportpce_tests/with_docker/test_nbinotifications.py b/tests/transportpce_tests/with_docker/test02_nbinotifications.py similarity index 100% rename from tests/transportpce_tests/with_docker/test_nbinotifications.py rename to tests/transportpce_tests/with_docker/test02_nbinotifications.py diff --git a/tox.ini b/tox.ini index b139ba6b2..298c8cb3f 100644 --- a/tox.ini +++ b/tox.ini @@ -12,7 +12,7 @@ setupdir = tests/ [testenv] passenv = USE_LIGHTY http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY setenv = - USE_LIGHTY = False + USE_LIGHTY=True usedevelop = true basepython = python3 deps = @@ -63,6 +63,8 @@ commands = depends = buildcontroller whitelist_externals = launch_tests.sh passenv = LAUNCHER USE_LIGHTY +setenv = + USE_LIGHTY=True commands = ./launch_tests.sh pce {posargs:} @@ -70,9 +72,9 @@ commands = depends = buildcontroller,sims121,testsPCE # testsPCE dependency is only here to chain tests in the gate and avoid resources starvation whitelist_externals = launch_tests.sh -passenv = LAUNCHER +passenv = LAUNCHER USE_LIGHTY setenv = - USE_LIGHTY=False + USE_LIGHTY=True USE_ODL_ALT_WEBSOCKET_PORT=8186 USE_ODL_ALT_AKKA_PORT=2551 USE_ODL_ALT_AKKA_MGT_PORT=8559 @@ -96,9 +98,9 @@ commands = depends = buildcontroller,sims221,tests71 # tests71 dependency is only here to chain tests in the gate and avoid ressources starvation whitelist_externals = launch_tests.sh -passenv = LAUNCHER +passenv = LAUNCHER USE_LIGHTY setenv = - USE_LIGHTY=False + USE_LIGHTY=True USE_ODL_ALT_WEBSOCKET_PORT=8187 USE_ODL_ALT_AKKA_PORT=2552 USE_ODL_ALT_AKKA_MGT_PORT=8560 @@ -113,9 +115,9 @@ commands = [testenv:tests71] depends = buildcontroller,sims71 whitelist_externals = launch_tests.sh -passenv = LAUNCHER +passenv = LAUNCHER USE_LIGHTY setenv = - USE_LIGHTY=False + USE_LIGHTY=True USE_ODL_ALT_WEBSOCKET_PORT=8188 USE_ODL_ALT_AKKA_PORT=2553 USE_ODL_ALT_AKKA_MGT_PORT=8561 @@ -131,9 +133,9 @@ commands = depends = buildcontroller,sims121,sims221,sims71,tests121,tests221,tests71 #the last dependency is to avoid temporarily concurrent ressources problem in parallel mode whitelist_externals = launch_tests.sh -passenv = LAUNCHER +passenv = LAUNCHER USE_LIGHTY setenv = - USE_LIGHTY=False + USE_LIGHTY=True USE_ODL_ALT_WEBSOCKET_PORT=8186 USE_ODL_ALT_AKKA_PORT=2551 USE_ODL_ALT_AKKA_MGT_PORT=8559 @@ -150,19 +152,21 @@ commands = depends = buildcontroller whitelist_externals = sh sudo +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 - nosetests --with-xunit transportpce_tests/with_docker/test_gnpy.py + ./launch_tests.sh with_docker gnpy sudo docker container rm -f gnpy_tpce_rest1 [testenv:nbinotifications] depends = buildcontroller,sims221 whitelist_externals = sh sudo +passenv = LAUNCHER USE_LIGHTY commands = sudo docker-compose -f ./nbinotifications/docker-compose.yml up -d - nosetests --with-xunit transportpce_tests/with_docker/test_nbinotifications.py + ./launch_tests.sh with_docker nbinotifications sudo docker-compose -f ./nbinotifications/docker-compose.yml down --rmi all [testenv:docs] -- 2.36.6