summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-07-11 11:35:33 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-07-11 13:49:43 +0200
commit8c5703e4e2382f7091aa7f8008d65ce68fa0bf56 (patch)
tree799991d7a6761b84dbbeef4a617fcd05d17ffa6e
parent4f89564b20e9c3462614706a616d469540631786 (diff)
Update rally image name regex
The default value doesn't conform with our image names. Else it downloads the image from internet which may be not possible (offline testing, proxy or deployment l3 issues [1]) [1] https://build.opnfv.org/ci/view/functest/job/functest-apex-virtual-suite-master/113/console Change-Id: I7d951967784d591e7155fe8582299aaa9b680b10 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--functest/opnfv_tests/openstack/tempest/tempest.py11
-rw-r--r--functest/tests/unit/openstack/tempest/test_tempest.py3
2 files changed, 13 insertions, 1 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 3701e485f..9e200bbd6 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -19,6 +19,7 @@ import shutil
import subprocess
import time
+from six.moves import configparser
from xtesting.core import testcase
import yaml
@@ -249,6 +250,15 @@ class TempestCommon(singlevm.VmReady1):
subprocess.Popen(cmd, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT)
+ def update_rally_regex(self, rally_conf='/etc/rally/rally.conf'):
+ """Set image name as tempest img_name_regex"""
+ rconfig = configparser.RawConfigParser()
+ rconfig.read(rally_conf)
+ rconfig.set('tempest', 'img_name_regex', '^{}$'.format(
+ self.image.name))
+ with open(rally_conf, 'wb') as config_file:
+ rconfig.write(config_file)
+
def configure(self, **kwargs): # pylint: disable=unused-argument
"""
Create all openstack resources for tempest-based testcases and write
@@ -277,6 +287,7 @@ class TempestCommon(singlevm.VmReady1):
self.start_time = time.time()
try:
super(TempestCommon, self).run(**kwargs)
+ self.update_rally_regex()
self.configure(**kwargs)
self.generate_test_list(**kwargs)
self.apply_tempest_blacklist()
diff --git a/functest/tests/unit/openstack/tempest/test_tempest.py b/functest/tests/unit/openstack/tempest/test_tempest.py
index 14ba9f75f..3dd05abb6 100644
--- a/functest/tests/unit/openstack/tempest/test_tempest.py
+++ b/functest/tests/unit/openstack/tempest/test_tempest.py
@@ -249,7 +249,8 @@ class OSTempestTesting(unittest.TestCase):
self._test_run(testcase.TestCase.EX_RUN_ERROR)
def test_run(self):
- with mock.patch.object(self.tempestcommon, 'generate_test_list'), \
+ with mock.patch.object(self.tempestcommon, 'update_rally_regex'), \
+ mock.patch.object(self.tempestcommon, 'generate_test_list'), \
mock.patch.object(self.tempestcommon,
'apply_tempest_blacklist'), \
mock.patch.object(self.tempestcommon, 'run_verifier_tests'), \