aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/benchmarking/Dockerfile4
-rw-r--r--functest/opnfv_tests/openstack/rally/rally.py20
2 files changed, 2 insertions, 22 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile
index fed1b1388..5b782d567 100644
--- a/docker/benchmarking/Dockerfile
+++ b/docker/benchmarking/Dockerfile
@@ -17,12 +17,12 @@ RUN apk --no-cache add --update libxml2 libxslt && \
pip3 install --no-cache-dir --src /src -c/src/requirements/upper-constraints.txt \
-c/src/functest/upper-constraints.txt \
/src/vmtp && \
- mkdir -p /home/opnfv/functest/data/rally/neutron && \
+ mkdir -p /home/opnfv/functest/data/rally/neutron/rally-jobs && \
git init /src/neutron && \
(cd /src/neutron && \
git fetch --tags https://opendev.org/openstack/neutron.git $OPENSTACK_TAG && \
git checkout FETCH_HEAD) && \
- cp -r /src/neutron/rally-jobs /home/opnfv/functest/data/rally/neutron/rally-jobs && \
+ cp /src/neutron/rally-jobs/task-neutron.yaml /home/opnfv/functest/data/rally/neutron/rally-jobs/ && \
rm -r /src/vmtp /src/neutron && \
apk del .build-deps
COPY testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml
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()