aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-06-14 15:11:00 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-06-15 09:06:44 +0200
commit4375f6b9cbf0916c8d82ab31cd30e45e40129ff6 (patch)
treeb87bd83e98b7abca79c200b28e4221855c09cca8 /functest/opnfv_tests
parent42784cc1bcadf88e37658c6d8692e44f87dcfe3a (diff)
Stop leveraging on neutron plugins and extra
Neutron leverages on the upstream Rally task in Stein and newer. Leveraging on the upstream task may fix the side effects which sometimes occured on Vmtp and Shaker [1] and filled better the CNTT model. [1] https://build.opnfv.org/ci/view/functest/job/functest-hunter-daily/574/ Change-Id: I5ee2e3a3ca956cf57365bf4579534177e87dc08b Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/opnfv_tests')
-rw-r--r--functest/opnfv_tests/openstack/rally/rally.py20
1 files changed, 0 insertions, 20 deletions
diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py
index 2f5b0aae5..e2b0b07bd 100644
--- a/functest/opnfv_tests/openstack/rally/rally.py
+++ b/functest/opnfv_tests/openstack/rally/rally.py
@@ -810,26 +810,10 @@ class RallyJobs(RallyBase):
task_args['flavor_name'] = str(self.flavor.name)
return task_args
- @staticmethod
- def _remove_plugins_extra():
- inst_dir = getattr(config.CONF, 'dir_rally_inst')
- try:
- shutil.rmtree(os.path.join(inst_dir, 'plugins'))
- shutil.rmtree(os.path.join(inst_dir, 'extra'))
- except Exception: # pylint: disable=broad-except
- pass
-
def prepare_task(self, test_name):
"""Prepare resources for test run."""
- self._remove_plugins_extra()
jobs_dir = os.path.join(
getattr(config.CONF, 'dir_rally_data'), test_name, 'rally-jobs')
- inst_dir = getattr(config.CONF, 'dir_rally_inst')
- shutil.copytree(os.path.join(jobs_dir, 'plugins'),
- os.path.join(inst_dir, 'plugins'))
- shutil.copytree(os.path.join(jobs_dir, 'extra'),
- os.path.join(inst_dir, 'extra'))
-
task_name = self.task_yaml.get(test_name).get("task")
task = os.path.join(jobs_dir, task_name)
if not os.path.exists(task):
@@ -844,7 +828,3 @@ class RallyJobs(RallyBase):
"--task", task_file_name,
"--task-args", str(self.build_task_args(test_name))])
return True
-
- def clean(self):
- self._remove_plugins_extra()
- super(RallyJobs, self).clean()