Rally and Tempest pre-installed in the Docker image.

[functest.git] / testcases / VIM / OpenStack / CI / libraries / run_tempest.py

diff --git a/testcases/VIM/OpenStack/CI/libraries/run_tempest.py b/testcases/VIM/OpenStack/CI/libraries/run_tempest.py
index 5738fd4..04d8e86 100644 (file)
--- a/testcases/VIM/OpenStack/CI/libraries/run_tempest.py
+++ b/testcases/VIM/OpenStack/CI/libraries/run_tempest.py
@@ -33,12 +33,21 @@ modes = ['full', 'smoke', 'baremetal', 'compute', 'data_processing',
 
 """ tests configuration """
 parser = argparse.ArgumentParser()
-parser.add_argument("-d", "--debug", help="Debug mode",  action="store_true")
-parser.add_argument("-m", "--mode", help="Tempest test mode [smoke, all]",
+parser.add_argument("-d", "--debug",
+                    help="Debug mode",
+                    action="store_true")
+parser.add_argument("-s", "--serial",
+                    help="Run tests in one thread",
+                    action="store_true")
+parser.add_argument("-m", "--mode",
+                    help="Tempest test mode [smoke, all]",
                     default="smoke")
 parser.add_argument("-r", "--report",
                     help="Create json result file",
                     action="store_true")
+parser.add_argument("-n", "--noclean",
+                    help="Don't clean the created resources for this test.",
+                    action="store_true")
 
 args = parser.parse_args()
 
@@ -203,13 +212,12 @@ 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)
 
 
     # Copy tempest.conf to /home/opnfv/functest/results/tempest/
-    print shutil.copyfile(tempest_conf_file,TEMPEST_RESULTS_DIR+'/tempest.conf')
+    shutil.copyfile(tempest_conf_file,TEMPEST_RESULTS_DIR+'/tempest.conf')
     return True
 
 
@@ -220,7 +228,7 @@ def run_tempest(OPTION):
     # :return: void
     #
     logger.info("Starting Tempest test suite: '%s'." % OPTION)
-    cmd_line = "rally verify start "+OPTION
+    cmd_line = "rally verify start " + OPTION + " --system-wide"
     logger.debug('Executing command : {}'.format(cmd_line))
 
     CI_DEBUG = os.environ.get("CI_DEBUG")
@@ -290,12 +298,19 @@ def main():
     else:
         MODE = "--set "+args.mode
 
+    if args.serial:
+        MODE = "--concur 1 "+MODE
+
     if not os.path.exists(TEMPEST_RESULTS_DIR):
         os.makedirs(TEMPEST_RESULTS_DIR)
 
     create_tempest_resources()
     configure_tempest()
     run_tempest(MODE)
+
+    if args.noclean:
+        exit(0)
+
     free_tempest_resources()