diff options
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/config_functest.yaml | 2 | ||||
| -rwxr-xr-x | ci/exec_test.sh | 5 | ||||
| -rw-r--r-- | ci/testcases.yaml | 2 | ||||
| -rw-r--r-- | ci/tier_handler.py | 10 |
4 files changed, 15 insertions, 4 deletions
diff --git a/ci/config_functest.yaml b/ci/config_functest.yaml index e4468208e..fb4103d34 100644 --- a/ci/config_functest.yaml +++ b/ci/config_functest.yaml @@ -74,6 +74,8 @@ tempest: tenant_description: Tenant for Tempest test suite user_name: tempest user_password: tempest + validation: + ssh_timeout: 130 private_net_name: tempest-net private_subnet_name: tempest-subnet private_subnet_cidr: 192.168.150.0/24 diff --git a/ci/exec_test.sh b/ci/exec_test.sh index 2ef714d56..ddbe486f1 100755 --- a/ci/exec_test.sh +++ b/ci/exec_test.sh @@ -163,6 +163,11 @@ function run_test(){ if [ $ret_val != 0 ]; then exit $ret_val fi + bash ${FUNCTEST_REPO_DIR}/testcases/features/sfc/compute_presetup_CI.bash + ret_val=$? + if [ $ret_val != 0 ]; then + exit $ret_val + fi source ${FUNCTEST_REPO_DIR}/testcases/features/sfc/tackerc python ${FUNCTEST_REPO_DIR}/testcases/features/sfc/sfc.py ;; diff --git a/ci/testcases.yaml b/ci/testcases.yaml index cef79c692..47d544b96 100644 --- a/ci/testcases.yaml +++ b/ci/testcases.yaml @@ -257,7 +257,7 @@ tiers: scenario: '(ocl)|(nosdn)|^(os-odl)((?!bgpvpn).)*$' - name: parser - criteria: 'status == "PASS"' + criteria: 'ret == 0' blocking: false description: >- Test suite from Parser project. diff --git a/ci/tier_handler.py b/ci/tier_handler.py index e50fbe6fd..1eadfba50 100644 --- a/ci/tier_handler.py +++ b/ci/tier_handler.py @@ -111,17 +111,21 @@ class TestCase: self.criteria = criteria self.blocking = blocking + @staticmethod + def is_none(item): + return item is None or item is "" + def is_compatible(self, ci_installer, ci_scenario): try: - if ci_installer is not None: + if not self.is_none(ci_installer): if re.search(self.dependency.get_installer(), ci_installer) is None: return False - if ci_scenario is not None: + if not self.is_none(ci_scenario): if re.search(self.dependency.get_scenario(), ci_scenario) is None: return False - return not (ci_scenario is None and ci_installer is None) + return True except TypeError: return False |