diff options
| -rwxr-xr-x | ci/exec_test.sh | 4 | ||||
| -rw-r--r-- | ci/tier_handler.py | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/ci/exec_test.sh b/ci/exec_test.sh index 0bb8389d5..48f2894af 100755 --- a/ci/exec_test.sh +++ b/ci/exec_test.sh @@ -83,7 +83,9 @@ function run_test(){ ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/start_tests.sh # push results to the DB in case of CI - if [[ -n "$DEPLOY_SCENARIO" && "$DEPLOY_SCENARIO" != "none" ]]; then + if [[ -n "$DEPLOY_SCENARIO" && "$DEPLOY_SCENARIO" != "none" && + -n "$INSTALLER_TYPE" && "$INSTALLER_TYPE" != "none" ]] && + env | grep NODE_NAME > /dev/null; then odl_logs="/home/opnfv/functest/results/odl/logs/2" odl_path="${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/" node_name=$(env | grep NODE_NAME | cut -f2 -d'=') diff --git a/ci/tier_handler.py b/ci/tier_handler.py index 03db4a91d..b1ef52d8f 100644 --- a/ci/tier_handler.py +++ b/ci/tier_handler.py @@ -109,10 +109,15 @@ class TestCase: def is_compatible(self, ci_installer, ci_scenario): try: - return not (re.search(self.dependency.get_installer(), - ci_installer) is None or - re.search(self.dependency.get_scenario(), - ci_scenario) is None) + if ci_installer is not None: + if re.search(self.dependency.get_installer(), + ci_installer) is None: + return False + if ci_scenario is not None: + if re.search(self.dependency.get_scenario(), + ci_scenario) is None: + return False + return not (ci_scenario is None and ci_installer is None) except TypeError: return False |