diff options
| -rw-r--r-- | INFO | 2 | ||||
| -rw-r--r-- | ci/testcases.yaml | 2 | ||||
| -rwxr-xr-x | testcases/features/copper.py | 1 | ||||
| -rwxr-xr-x | testcases/features/doctor.py | 1 | ||||
| -rwxr-xr-x | testcases/features/domino.py | 1 | ||||
| -rwxr-xr-x | testcases/features/promise.py | 1 | ||||
| -rwxr-xr-x | testcases/features/sfc/sfc.py | 5 | ||||
| -rwxr-xr-x | testcases/vnf/vRNC/parser.py | 1 |
8 files changed, 8 insertions, 6 deletions
@@ -11,6 +11,8 @@ IRC: Server:freenode.net Channel:#opnfv-testperf Repository: functest Committers: +serena.feng.711@gmail.com +ollivier.cedric@gmail.com jose.lausuch@ericsson.com morgan.richomme@orange.com meimei@huawei.com diff --git a/ci/testcases.yaml b/ci/testcases.yaml index 69d4a2ef1..1fa0a4c03 100644 --- a/ci/testcases.yaml +++ b/ci/testcases.yaml @@ -215,7 +215,7 @@ tiers: Test suite from Parser project. dependencies: installer: 'fuel' - scenario: '' + scenario: '^((?!noha).)*$' - name: openstack order: 4 diff --git a/testcases/features/copper.py b/testcases/features/copper.py index c312643eb..c79754a1b 100755 --- a/testcases/features/copper.py +++ b/testcases/features/copper.py @@ -32,7 +32,6 @@ with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: functest_yaml = yaml.safe_load(f) dirs = functest_yaml.get('general').get('directories') -FUNCTEST_REPO = dirs.get('dir_repo_functest') COPPER_REPO = dirs.get('dir_repo_copper') logger = ft_logger.Logger("copper").getLogger() diff --git a/testcases/features/doctor.py b/testcases/features/doctor.py index 154cfc695..02edd25ca 100755 --- a/testcases/features/doctor.py +++ b/testcases/features/doctor.py @@ -31,7 +31,6 @@ with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: functest_yaml = yaml.safe_load(f) dirs = functest_yaml.get('general').get('directories') -FUNCTEST_REPO = dirs.get('dir_repo_functest') DOCTOR_REPO = dirs.get('dir_repo_doctor') logger = ft_logger.Logger("doctor").getLogger() diff --git a/testcases/features/domino.py b/testcases/features/domino.py index 03ad4a2af..291a3b49b 100755 --- a/testcases/features/domino.py +++ b/testcases/features/domino.py @@ -33,7 +33,6 @@ with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: functest_yaml = yaml.safe_load(f) dirs = functest_yaml.get('general').get('directories') -FUNCTEST_REPO = dirs.get('dir_repo_functest') DOMINO_REPO = dirs.get('dir_repo_domino') logger = ft_logger.Logger("domino").getLogger() diff --git a/testcases/features/promise.py b/testcases/features/promise.py index f5db02617..3728adfe5 100755 --- a/testcases/features/promise.py +++ b/testcases/features/promise.py @@ -36,7 +36,6 @@ with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: functest_yaml = yaml.safe_load(f) dirs = functest_yaml.get('general').get('directories') -FUNCTEST_REPO = dirs.get('dir_repo_functest') PROMISE_REPO = dirs.get('dir_repo_promise') TEST_DB = functest_yaml.get('results').get('test_db_url') diff --git a/testcases/features/sfc/sfc.py b/testcases/features/sfc/sfc.py index f8af51060..3cf1052b6 100755 --- a/testcases/features/sfc/sfc.py +++ b/testcases/features/sfc/sfc.py @@ -238,6 +238,11 @@ def main(): except: logger.debug("Problems assigning floating IP to SFs") + # If no IPs were obtained, then we cant continue + if not ips: + logger.error('Failed to obtain IPs, cant continue, exiting') + return + logger.debug("Floating IPs for SFs: %s..." % ips) # SSH TO START THE VXLAN_TOOL ON SF1 diff --git a/testcases/vnf/vRNC/parser.py b/testcases/vnf/vRNC/parser.py index 40d28c49f..00593b0b0 100755 --- a/testcases/vnf/vRNC/parser.py +++ b/testcases/vnf/vRNC/parser.py @@ -32,7 +32,6 @@ with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: functest_yaml = yaml.safe_load(f) dirs = functest_yaml.get('general').get('directories') -FUNCTEST_REPO = dirs.get('dir_repo_functest') PARSER_REPO = dirs.get('dir_repo_parser') logger = ft_logger.Logger("parser").getLogger() |