From e80d2f322ac5b5f5c007055366b5ed793553b488 Mon Sep 17 00:00:00 2001 From: Viktor Tikkanen Date: Mon, 8 Feb 2016 19:40:22 +0200 Subject: Used sed instead of crudini for updating regex It seems that crudini has limitations regarding quotation marks so sed tool is used instead in order to replace ssh_user_regex parameter into tempest.conf file. Change-Id: I8587b3e6b0c15930407ab90bf05f00086348edf6 Signed-off-by: Viktor Tikkanen (cherry picked from commit 8d7f1158885ca2d880811747b07f34ab50d2031d) --- testcases/VIM/OpenStack/CI/libraries/run_tempest.py | 3 +-- testcases/config_functest.yaml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/testcases/VIM/OpenStack/CI/libraries/run_tempest.py b/testcases/VIM/OpenStack/CI/libraries/run_tempest.py index 5738fd479..b8ed2716e 100644 --- a/testcases/VIM/OpenStack/CI/libraries/run_tempest.py +++ b/testcases/VIM/OpenStack/CI/libraries/run_tempest.py @@ -203,8 +203,7 @@ def configure_tempest(): cmd = "crudini --set "+tempest_conf_file+" identity password " \ +USER_PASSWORD functest_utils.execute_command(cmd,logger) - cmd = "crudini --set "+tempest_conf_file+" input-scenario ssh_user_regex " \ - +SSH_USER_REGEX + cmd = "sed -i 's/.*ssh_user_regex.*/ssh_user_regex = "+SSH_USER_REGEX+"/' "+tempest_conf_file functest_utils.execute_command(cmd,logger) diff --git a/testcases/config_functest.yaml b/testcases/config_functest.yaml index c9fb18bf3..f32314ac6 100644 --- a/testcases/config_functest.yaml +++ b/testcases/config_functest.yaml @@ -83,7 +83,7 @@ tempest: user_name: tempest user_password: tempest input-scenario: - ssh_user_regex: [["^.*[Cc]irros.*$", "cirros"], ["^.*[Tt]est[VvMm].*$", "cirros"], ["^.*rally_verify.*$", "cirros"]] + ssh_user_regex: '[["^.*[Cc]irros.*$", "cirros"], ["^.*[Tt]est[VvMm].*$", "cirros"], ["^.*rally_verify.*$", "cirros"]]' rally: deployment_name: opnfv-rally -- cgit 1.2.3-korg