diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-08-30 07:07:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-30 07:07:45 +0000 |
| commit | c1c666b957bd235fd86fbbac2fea4d541983c44d (patch) | |
| tree | a367016f6d11398d09d456d65d72bc62fea1d734 /ci | |
| parent | 07d5fe736339091750d7240b68644d6866b17205 (diff) | |
| parent | 66334bc798c25d5769f92f2a6292daaf6220da79 (diff) | |
Merge "Set env vars as mandatory to push to DB"
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/exec_test.sh | 7 |
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} \ |