From 616eeb94050ffe1e43b9710ed54c3822c4b3d36f Mon Sep 17 00:00:00 2001 From: Gilles Thouenon Date: Mon, 9 May 2022 10:30:42 +0200 Subject: [PATCH] Extract in CI tapi functional tests from tests221 That allows to manage TAPI as an optional feature in lighty build, as it is the case with karaf and nbinotifications. - create a new tests_tapi tox profile - move the current two functional test suites in the new 'transportpce_tests/tapi' directory - run tapi functional tests first JIRA: TRNSPRTPCE-663 Signed-off-by: Gilles Thouenon Change-Id: I24d663a3590f3f1c6a426eeb9f77db297e898fec --- .../test01_abstracted_topology.py} | 0 .../test02_full_topology.py} | 0 tox.ini | 20 ++++++++++++++++--- 3 files changed, 17 insertions(+), 3 deletions(-) rename tests/transportpce_tests/{2.2.1/test10_tapi.py => tapi/test01_abstracted_topology.py} (100%) rename tests/transportpce_tests/{2.2.1/test13_tapi_full_multi_layer.py => tapi/test02_full_topology.py} (100%) diff --git a/tests/transportpce_tests/2.2.1/test10_tapi.py b/tests/transportpce_tests/tapi/test01_abstracted_topology.py similarity index 100% rename from tests/transportpce_tests/2.2.1/test10_tapi.py rename to tests/transportpce_tests/tapi/test01_abstracted_topology.py diff --git a/tests/transportpce_tests/2.2.1/test13_tapi_full_multi_layer.py b/tests/transportpce_tests/tapi/test02_full_topology.py similarity index 100% rename from tests/transportpce_tests/2.2.1/test13_tapi_full_multi_layer.py rename to tests/transportpce_tests/tapi/test02_full_topology.py diff --git a/tox.ini b/tox.ini index ddbd19e70..de2aeec39 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ minversion = 3.7.0 envlist = buildcontroller,testsPCE, sims121,build_karaf_tests121,tests121, - sims221,build_karaf_tests221,tests221, + sims221,build_karaf_tests221,tests221,tests_tapi, sims71,build_karaf_tests71,tests71, build_karaf_tests_hybrid,tests_hybrid, docs @@ -144,7 +144,7 @@ commands = ./build_karaf_for_tests.sh [testenv:tests71] -depends = buildcontroller,build_karaf_tests71,sims71 +depends = buildcontroller,build_karaf_tests71,sims71,tests_tapi whitelist_externals = launch_tests.sh passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION setenv = @@ -168,7 +168,7 @@ commands = ./build_karaf_for_tests.sh [testenv:tests_hybrid] -depends = buildcontroller,sims121,sims221,sims71,tests121,tests221,tests71 +depends = buildcontroller,build_karaf_tests_hybrid,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 USE_LIGHTY USE_ODL_RESTCONF_VERSION @@ -180,6 +180,20 @@ commands = # nosetests --with-xunit transportpce_tests/hybrid/test01_device_change_notifications.py ./launch_tests.sh hybrid {posargs:} +[testenv:tests_tapi] +depends = buildcontroller,build_karaf_tests221,sims221 +whitelist_externals = launch_tests.sh +passenv = LAUNCHER USE_LIGHTY OLM_TIMER1 OLM_TIMER2 USE_ODL_RESTCONF_VERSION +setenv = + USE_LIGHTY=True + USE_ODL_RESTCONF_VERSION=draft-bierman02 + USE_ODL_ALT_KARAF_ENV=./karaf221.env + USE_ODL_ALT_KARAF_INSTALL_DIR=karaf221 + INSTALL_TAPI=True + +commands = + ./launch_tests.sh tapi {posargs:} + [testenv:nbinotifications] depends = buildcontroller,sims221 whitelist_externals = launch_tests.sh -- 2.36.6