aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2016-08-26 16:53:41 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2016-08-26 17:11:12 +0200
commit66334bc798c25d5769f92f2a6292daaf6220da79 (patch)
tree106d209c3acf5706f313efcb523adca3dc81f532 /ci
parent184c0b96b4216032191602941a47572492a2f916 (diff)
Set env vars as mandatory to push to DB
Now env vars are mandatory in push_results_to_db. It avoids testing programs to check them even if they are useless from their points of view. The related getters aren't removed to help debugging via logger_test_results which could be run without report. Change-Id: Iadb94319529f5ec4230fb62042511948183b93ed Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/exec_test.sh7
1 files changed, 1 insertions, 6 deletions
diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index 20f7c2d4..7c4b3578 100755
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -78,12 +78,7 @@ function run_test(){
;;
"odl")
odl_tests
- if [[ "$report" == "-r" &&
- -n "$DEPLOY_SCENARIO" && "$DEPLOY_SCENARIO" != "none" &&
- -n "$INSTALLER_TYPE" && "$INSTALLER_TYPE" != "none" ]] &&
- env | grep NODE_NAME > /dev/null; then
- args=-p
- fi
+ [[ "$report" == "-r" ]] && args=-p
${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/OpenDaylightTesting.py \
--keystoneip $keystone_ip --neutronip $neutron_ip \
--osusername ${OS_USERNAME} --ostenantname ${OS_TENANT_NAME} \