Code Review
/
transportpce.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Adapt some dependencies to Chlorine
[transportpce.git]
/
tox.ini
diff --git
a/tox.ini
b/tox.ini
index 20de1d61c5c24f9f0a3ccc2dcb4767358a7eebe5..075341b0c6e2fd0fc380cc0ed74bc69eb086a355 100644
(file)
--- a/
tox.ini
+++ b/
tox.ini
@@
-61,7
+61,7
@@
depends = buildcontroller
setenv =
PIP_EXTRA_INDEX_URL = https://gitlab.com/api/v4/projects/33090323/packages/pypi/simple
# USE_LIGHTY=True
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_ODL_RESTCONF_VERSION=draft-bierman02
deps =
-r{toxinidir}/tests/requirements.txt
-r{toxinidir}/tests/test-requirements.txt
deps =
-r{toxinidir}/tests/requirements.txt
-r{toxinidir}/tests/test-requirements.txt
@@
-92,7
+92,7
@@
whitelist_externals = launch_tests.sh
passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
setenv =
# USE_LIGHTY=True
passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
setenv =
# USE_LIGHTY=True
- USE_ODL_RESTCONF_VERSION=draft-bierman02
+
#
USE_ODL_RESTCONF_VERSION=draft-bierman02
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 =
@@
-125,7
+125,7
@@
whitelist_externals = launch_tests.sh
passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
setenv =
# USE_LIGHTY=True
passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
setenv =
# USE_LIGHTY=True
- USE_ODL_RESTCONF_VERSION=draft-bierman02
+
#
USE_ODL_RESTCONF_VERSION=draft-bierman02
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 =
@@
-149,7
+149,7
@@
whitelist_externals = launch_tests.sh
passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
setenv =
# USE_LIGHTY=True
passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
setenv =
# USE_LIGHTY=True
- USE_ODL_RESTCONF_VERSION=draft-bierman02
+
#
USE_ODL_RESTCONF_VERSION=draft-bierman02
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 =
@@
-157,12
+157,10
@@
commands =
[testenv:build_karaf_tests_hybrid]
depends = buildcontroller
[testenv:build_karaf_tests_hybrid]
depends = buildcontroller
-# testsPCE dependency is only here to chain tests in the gate and avoid resources starvation
whitelist_externals = launch_tests.sh
passenv = LAUNCHER USE_LIGHTY
setenv =
# USE_LIGHTY=True
whitelist_externals = launch_tests.sh
passenv = LAUNCHER USE_LIGHTY
setenv =
# USE_LIGHTY=True
-# USE_ODL_RESTCONF_VERSION=draft-bierman02
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 =
@@
-175,7
+173,7
@@
whitelist_externals = launch_tests.sh
passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
setenv =
# USE_LIGHTY=True
passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
setenv =
# USE_LIGHTY=True
- USE_ODL_RESTCONF_VERSION=draft-bierman02
+
#
USE_ODL_RESTCONF_VERSION=draft-bierman02
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 =
@@
-188,7
+186,7
@@
whitelist_externals = launch_tests.sh
passenv = LAUNCHER USE_LIGHTY OLM_TIMER1 OLM_TIMER2 USE_ODL_RESTCONF_VERSION
setenv =
# USE_LIGHTY=True
passenv = LAUNCHER USE_LIGHTY OLM_TIMER1 OLM_TIMER2 USE_ODL_RESTCONF_VERSION
setenv =
# USE_LIGHTY=True
- USE_ODL_RESTCONF_VERSION=draft-bierman02
+
#
USE_ODL_RESTCONF_VERSION=draft-bierman02
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
@@
-208,6
+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
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