From cb314a5608118a8e9a446f0ba00241705a21cfb2 Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Tue, 25 Jul 2023 16:23:55 +0200 Subject: [PATCH] Add a Xtesting entry to combine all tests cases Signed-off-by: guillaume.lambert Change-Id: Ifca5a721416ccfb3d8d8ef424698d15300702a5f --- .pre-commit-config.yaml | 2 +- tests/Xtesting/patch.diff | 31 +++++++++++++++++++++++++++++++ tests/Xtesting/site.yml | 15 ++++++++------- tests/Xtesting/testcases.yaml | 17 +++++++++++++++++ 4 files changed, 57 insertions(+), 8 deletions(-) create mode 100644 tests/Xtesting/patch.diff diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e2513a913..954379b1e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,7 +4,7 @@ repos: rev: v4.3.0 hooks: - id: trailing-whitespace - exclude: '^ordmodels/' + exclude: '^ordmodels/|.diff$' # ordmodels trailing blanks shall preferably be fixed in OpenROADM upstream repo - repo: https://github.com/jorisroovers/gitlint diff --git a/tests/Xtesting/patch.diff b/tests/Xtesting/patch.diff new file mode 100644 index 000000000..d8999db9b --- /dev/null +++ b/tests/Xtesting/patch.diff @@ -0,0 +1,31 @@ +diff --git a/tox.ini b/tox.ini +index 7cae5c70..dd44b57a 100644 +--- a/tox.ini ++++ b/tox.ini +@@ -94,7 +94,7 @@ commands = + ./build_karaf_for_tests.sh + + [testenv:tests121] +-depends = buildcontroller,build_karaf_tests121,sims121,testsPCE ++depends = buildcontroller,build_karaf_tests121,sims121 + # testsPCE dependency is only here to chain tests in the gate and avoid resources starvation + allowlist_externals = launch_tests.sh + passenv = LAUNCHER, USE_LIGHTY, NO_ODL_STARTUP, USE_ODL_RESTCONF_VERSION +@@ -127,7 +127,7 @@ commands = + ./build_karaf_for_tests.sh + + [testenv:tests221] +-depends = buildcontroller,build_karaf_tests221,sims221,tests71 ++depends = buildcontroller,build_karaf_tests221,sims221,tests_tapi + # tests71 dependency is only here to chain tests in the gate and avoid ressources starvation + allowlist_externals = launch_tests.sh + passenv = LAUNCHER, USE_LIGHTY, NO_ODL_STARTUP, USE_ODL_RESTCONF_VERSION +@@ -152,7 +152,7 @@ commands = + ./build_karaf_for_tests.sh + + [testenv:tests71] +-depends = buildcontroller,build_karaf_tests71,sims71,tests_tapi ++depends = buildcontroller,build_karaf_tests71,sims71 + allowlist_externals = launch_tests.sh + passenv = LAUNCHER, USE_LIGHTY, NO_ODL_STARTUP, USE_ODL_RESTCONF_VERSION + setenv = diff --git a/tests/Xtesting/site.yml b/tests/Xtesting/site.yml index df8887c52..fc832f37f 100644 --- a/tests/Xtesting/site.yml +++ b/tests/Xtesting/site.yml @@ -11,10 +11,11 @@ suites: - container: tpce0 tests: - - linters - - build - - PCE - - 121 - - 221 - - 71 - - hybrid + - combined +# - linters +# - build +# - PCE +# - 121 +# - 221 +# - 71 +# - hybrid diff --git a/tests/Xtesting/testcases.yaml b/tests/Xtesting/testcases.yaml index e17ab82d5..67cd870ff 100644 --- a/tests/Xtesting/testcases.yaml +++ b/tests/Xtesting/testcases.yaml @@ -89,3 +89,20 @@ tiers: args: cmd: 'cd /src/transportpce && tox -e buildcontroller,build_karaf_tests_hybrid,tests_hybrid' console: true + - + name: combined + order: 1 + description: 'combine all transportPCE tests' + testcases: + - + case_name: combined + project_name: transportpce + criteria: 100 + blocking: true + clean_flag: false + description: 'run all transportPCE tests in parallell with tox' + run: + name: 'bashfeature' + args: + cmd: 'cd /src/transportpce && git apply tests/Xtesting/patch.diff && tox -o -p auto' + console: true -- 2.36.6