Code Review / transportpce.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 97d0dba)
Activate lighty runtime for functional tests 58/103358/4
authorGilles Thouenon <gilles.thouenon@orange.com>
Thu, 24 Nov 2022 16:17:33 +0000 (17:17 +0100)
committerChristophe BETOULE <christophe.betoule@orange.com>
Tue, 29 Nov 2022 16:23:08 +0000 (16:23 +0000)
- activate lighty in all tpce functional tests
- use the lighty url
- adapt the lighty build script

Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: If443a46fd2d7ea71b51dad398df72080189ac62e

lighty/build.sh patch | blob | history
tox.ini patch | blob | history

diff --git a/lighty/build.sh b/lighty/build.sh
index a3bcef4d0865d736f97ed0182d59b599cd53e5e8..ee04d5e90e4f2b112c9c6971bebc5b88367d600b 100755 (executable)
--- a/lighty/build.sh
+++ b/lighty/build.sh
@@ -3,5 +3,5 @@
 cd $(dirname "$0")
 export JDK_JAVA_OPTIONS="--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED"
 #./build_lighty_core.sh
 cd $(dirname "$0")
 export JDK_JAVA_OPTIONS="--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED"
 #./build_lighty_core.sh
-mvn clean install -B -U -Dmaven.javadoc.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+mvn clean install -B -U -Dmaven.javadoc.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -s ../tests/odl_settings.xml
 unzip -q target/tpce-bin.zip -d target
 unzip -q target/tpce-bin.zip -d target
diff --git a/tox.ini b/tox.ini
index 3baf8b2587b76abeaa1b543df217d39e08e8d237..c5841365b0f51eafae5154e6cbf9117d7ae408c5 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,7 @@ setupdir = tests/
 [testenv]
 passenv = USE_LIGHTY http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY OLM_TIMER1 OLM_TIMER2
 setenv =
 [testenv]
 passenv = USE_LIGHTY http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY OLM_TIMER1 OLM_TIMER2
 setenv =
-#    USE_LIGHTY=True
+    USE_LIGHTY=True
     OLM_TIMER1=3000
     OLM_TIMER2=2000
 
     OLM_TIMER1=3000
     OLM_TIMER2=2000
 
@@ -60,8 +60,8 @@ depends = buildcontroller
 #the following lines retrieve unofficial package of GNPy with REST support from Orange opensource Gitlab repo
 setenv =
     PIP_EXTRA_INDEX_URL = https://gitlab.com/api/v4/projects/33090323/packages/pypi/simple
 #the following lines retrieve unofficial package of GNPy with REST support from Orange opensource Gitlab repo
 setenv =
     PIP_EXTRA_INDEX_URL = https://gitlab.com/api/v4/projects/33090323/packages/pypi/simple
-#    USE_LIGHTY=True
-#    USE_ODL_RESTCONF_VERSION=draft-bierman02
+    USE_LIGHTY=True
+    USE_ODL_RESTCONF_VERSION=lighty
 deps =
   -r{toxinidir}/tests/requirements.txt
   -r{toxinidir}/tests/test-requirements.txt
 deps =
   -r{toxinidir}/tests/requirements.txt
   -r{toxinidir}/tests/test-requirements.txt
@@ -79,7 +79,7 @@ depends = buildcontroller
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY
 setenv =
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY
 setenv =
-#    USE_LIGHTY=True
+    USE_LIGHTY=True
     USE_ODL_ALT_KARAF_ENV=./karaf121.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf121
 commands =
     USE_ODL_ALT_KARAF_ENV=./karaf121.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf121
 commands =
@@ -91,8 +91,8 @@ depends = buildcontroller,build_karaf_tests121,sims121,testsPCE
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
 setenv =
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
 setenv =
-#    USE_LIGHTY=True
-#    USE_ODL_RESTCONF_VERSION=draft-bierman02
+    USE_LIGHTY=True
+    USE_ODL_RESTCONF_VERSION=lighty
     USE_ODL_ALT_KARAF_ENV=./karaf121.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf121
 commands =
     USE_ODL_ALT_KARAF_ENV=./karaf121.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf121
 commands =
@@ -112,7 +112,7 @@ depends = buildcontroller
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY
 setenv =
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY
 setenv =
-#    USE_LIGHTY=True
+    USE_LIGHTY=True
     USE_ODL_ALT_KARAF_ENV=./karaf221.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf221
 commands =
     USE_ODL_ALT_KARAF_ENV=./karaf221.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf221
 commands =
@@ -124,8 +124,8 @@ depends = buildcontroller,build_karaf_tests221,sims221,tests71
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
 setenv =
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
 setenv =
-#    USE_LIGHTY=True
-#    USE_ODL_RESTCONF_VERSION=draft-bierman02
+    USE_LIGHTY=True
+    USE_ODL_RESTCONF_VERSION=lighty
     USE_ODL_ALT_KARAF_ENV=./karaf221.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf221
 commands =
     USE_ODL_ALT_KARAF_ENV=./karaf221.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf221
 commands =
@@ -137,7 +137,7 @@ depends = buildcontroller
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY
 setenv =
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY
 setenv =
-#    USE_LIGHTY=True
+    USE_LIGHTY=True
     USE_ODL_ALT_KARAF_ENV=./karaf71.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf71
 commands =
     USE_ODL_ALT_KARAF_ENV=./karaf71.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf71
 commands =
@@ -148,8 +148,8 @@ depends = buildcontroller,build_karaf_tests71,sims71,tests_tapi
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
 setenv =
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
 setenv =
-#    USE_LIGHTY=True
-#    USE_ODL_RESTCONF_VERSION=draft-bierman02
+    USE_LIGHTY=True
+    USE_ODL_RESTCONF_VERSION=lighty
     USE_ODL_ALT_KARAF_ENV=./karaf71.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf71
 commands =
     USE_ODL_ALT_KARAF_ENV=./karaf71.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf71
 commands =
@@ -160,7 +160,7 @@ depends = buildcontroller
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY
 setenv =
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY
 setenv =
-#    USE_LIGHTY=True
+    USE_LIGHTY=True
     USE_ODL_ALT_KARAF_ENV=./karaf121.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf_hybrid
 commands =
     USE_ODL_ALT_KARAF_ENV=./karaf121.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf_hybrid
 commands =
@@ -172,8 +172,8 @@ depends = buildcontroller,build_karaf_tests_hybrid,sims121,sims221,sims71,tests1
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
 setenv =
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
 setenv =
-#    USE_LIGHTY=True
-#    USE_ODL_RESTCONF_VERSION=draft-bierman02
+    USE_LIGHTY=True
+    USE_ODL_RESTCONF_VERSION=lighty
     USE_ODL_ALT_KARAF_ENV=./karaf121.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf_hybrid
 commands =
     USE_ODL_ALT_KARAF_ENV=./karaf121.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf_hybrid
 commands =
@@ -185,8 +185,8 @@ depends = buildcontroller,build_karaf_tests221,sims221
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY OLM_TIMER1 OLM_TIMER2 USE_ODL_RESTCONF_VERSION
 setenv =
 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_LIGHTY=True
+    USE_ODL_RESTCONF_VERSION=lighty
     USE_ODL_ALT_KARAF_ENV=./karaf221.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf221
     INSTALL_TAPI=True
     USE_ODL_ALT_KARAF_ENV=./karaf221.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf221
     INSTALL_TAPI=True
@@ -206,7 +206,7 @@ setenv =
     OLM_TIMER2=2000
     INSTALL_TAPI=True
     INSTALL_NBINOTIFICATIONS=True
     OLM_TIMER2=2000
     INSTALL_TAPI=True
     INSTALL_NBINOTIFICATIONS=True
-#    USE_ODL_RESTCONF_VERSION=draft-bierman02
+    USE_ODL_RESTCONF_VERSION=lighty
 
 commands =
   ./dockercmd.sh run -d -p 2181:2181 -p 9092:9092 --env ADVERTISED_LISTENERS=PLAINTEXT://localhost:9092 --name tpce_kafka1 teivah/kafka:2.0.0
 
 commands =
   ./dockercmd.sh run -d -p 2181:2181 -p 9092:9092 --env ADVERTISED_LISTENERS=PLAINTEXT://localhost:9092 --name tpce_kafka1 teivah/kafka:2.0.0
Repository for Transport PCE project.