diff options
| -rw-r--r-- | ci/testcases.yaml | 2 | ||||
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | testcases/Controllers/ODL/OpenDaylightTesting.py | 2 | ||||
| -rwxr-xr-x | testcases/OpenStack/tempest/run_tempest.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ci/testcases.yaml b/ci/testcases.yaml index 11056708..aebb2d04 100644 --- a/ci/testcases.yaml +++ b/ci/testcases.yaml @@ -130,7 +130,7 @@ tiers: description: >- Test suite from Doctor project. dependencies: - installer: 'apex' + installer: '(apex)|(fuel)' scenario: '' - diff --git a/docker/Dockerfile b/docker/Dockerfile index a14bdc44..b27b881a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -73,7 +73,7 @@ RUN git clone https://gerrit.opnfv.org/gerrit/functest ${repos_dir}/functest RUN git clone https://gerrit.opnfv.org/gerrit/releng ${repos_dir}/releng RUN git clone https://gerrit.opnfv.org/gerrit/doctor ${repos_dir}/doctor RUN git clone -b 0.5.0 https://github.com/openstack/rally.git ${repos_dir}/rally -RUN git clone https://github.com/openstack/tempest.git ${repos_dir}/tempest +RUN git clone -b 12.1.0 https://github.com/openstack/tempest.git ${repos_dir}/tempest RUN git clone https://git.opendaylight.org/gerrit/p/integration/test.git ${repos_dir}/odl_test RUN git clone -b stable https://github.com/boucherv-orange/clearwater-live-test ${repos_dir}/vims-test RUN git clone https://github.com/openstack/networking-bgpvpn ${repos_dir}/bgpvpn diff --git a/testcases/Controllers/ODL/OpenDaylightTesting.py b/testcases/Controllers/ODL/OpenDaylightTesting.py index 2806b4f2..d3bc0978 100755 --- a/testcases/Controllers/ODL/OpenDaylightTesting.py +++ b/testcases/Controllers/ODL/OpenDaylightTesting.py @@ -133,7 +133,7 @@ class ODLTestCases: details['description'] = result.suite.name details['tests'] = visitor.get_data() if not ft_utils.push_results_to_db( - "functest", "odl", None, start_time, stop_time, + "functest", "odl", cls.logger, start_time, stop_time, result.suite.status, details): cls.logger.error("Cannot push ODL results to DB") return False diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py index c143fffa..7d023f5d 100755 --- a/testcases/OpenStack/tempest/run_tempest.py +++ b/testcases/OpenStack/tempest/run_tempest.py @@ -423,6 +423,7 @@ def main(): os.makedirs(TEMPEST_RESULTS_DIR) deployment_dir = ft_utils.get_deployment_dir(logger) + create_tempest_resources() if "" == args.conf: MODE = "" @@ -430,7 +431,6 @@ def main(): else: MODE = " --tempest-config " + args.conf - create_tempest_resources() generate_test_list(deployment_dir, args.mode) apply_tempest_blacklist() |