diff --git a/rdomanager_oscplugin/tests/v1/overcloud_validate/test_overcloud_validate.py b/rdomanager_oscplugin/tests/v1/overcloud_validate/test_overcloud_validate.py index d925d075c..118c00033 100644 --- a/rdomanager_oscplugin/tests/v1/overcloud_validate/test_overcloud_validate.py +++ b/rdomanager_oscplugin/tests/v1/overcloud_validate/test_overcloud_validate.py @@ -68,6 +68,5 @@ class TestOvercloudValidate(fakes.TestOvercloudValidate): 'network.build_timeout 500 ' 'volume.build_timeout 500 ' 'scenario.ssh_user cirros'), - mock.call('./run_tempest.sh --no-virtual-env -- bar 2>&1 | ' - 'tee /home/user/tempest/tempest-run.log') + mock.call('./tools/run-tests.sh bar') ]) diff --git a/rdomanager_oscplugin/utils.py b/rdomanager_oscplugin/utils.py index 696e4be4b..03af5aeee 100644 --- a/rdomanager_oscplugin/utils.py +++ b/rdomanager_oscplugin/utils.py @@ -376,4 +376,4 @@ def create_cephx_key(): def run_shell(cmd): - return subprocess.check_call([cmd], shell=True) + return subprocess.call([cmd], shell=True) diff --git a/rdomanager_oscplugin/v1/overcloud_validate.py b/rdomanager_oscplugin/v1/overcloud_validate.py index fbe941d39..acff64f03 100644 --- a/rdomanager_oscplugin/v1/overcloud_validate.py +++ b/rdomanager_oscplugin/v1/overcloud_validate.py @@ -54,14 +54,10 @@ class ValidateOvercloud(command.Command): {'auth_url': overcloud_auth_url, 'admin_password': overcloud_admin_password}) - full_tempest_args = '--no-virtual-env' - if tempest_args: - full_tempest_args = '%s -- %s' % (full_tempest_args, tempest_args) - log_file = os.path.join(tempest_run_dir, "tempest-run.log") - utils.run_shell('./run_tempest.sh %(tempest_args)s 2>&1 ' - '| tee %(log_file)s' % - {'tempest_args': full_tempest_args, - 'log_file': log_file}) + if tempest_args is None: + utils.run_shell('./tools/run-tests.sh') + else: + utils.run_shell('./tools/run-tests.sh %s' % tempest_args) def get_parser(self, prog_name): parser = super(ValidateOvercloud, self).get_parser(prog_name)