X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=testsuites%2Frun_testsuite.py;h=70e6d8c9c90929f519eecadc4a58042e4590299c;hb=28ac6b8788b3acc561c35c9946f73abb735c1df1;hp=2e82b205b74642f1d1c44808f394cb514a5fc311;hpb=1638be68bab8c75db32b34b0cb0a32d135e42574;p=bottlenecks.git

diff --git a/testsuites/run_testsuite.py b/testsuites/run_testsuite.py
index 2e82b205..70e6d8c9 100644
--- a/testsuites/run_testsuite.py
+++ b/testsuites/run_testsuite.py
@@ -36,6 +36,14 @@ LOG = log.Logger(__name__).getLogger()
 # ------------------------------------------------------
 
 
+def copy_hosts_file():
+    LOG.info("Begin copying hosts file to Bottlenecks-Yardstick")
+    os.system('cp /etc/hosts /tmp/hosts')
+    yardstick_docker = docker_env.docker_find('Bottlenecks-Yardstick')
+    docker_env.docker_exec_cmd(yardstick_docker, 'sudo cp -f /tmp/hosts /etc/hosts')
+    LOG.info("Done with copying hosts file to Bottlenecks-Yardstick")
+
+
 def posca_testcase_run(testsuite, testcase_script, test_config):
 
     module_string = "testsuites.%s.testcase_script.%s" % (testsuite,
@@ -107,10 +115,11 @@ def testsuite_run(test_level, test_name, REPORT="False"):
             conf_parser.Parser.testcase_out_dir(testcase)
         start_date = datetime.datetime.now()
         docker_env_prepare(config[testcase])
-        try:
-            posca_testcase_run(tester_parser[0], testcase, config[testcase])
-        except Exception, e:
-            LOG.warning('e.message:\t%s', e.message)
+        #try:
+        #    posca_testcase_run(tester_parser[0], testcase, config[testcase])
+        #except Exception, e:
+        #    LOG.warning('e.message:\t%s', e.message)
+        posca_testcase_run(tester_parser[0], testcase, config[testcase])
         stop_date = datetime.datetime.now()
         LOG.info("End of %s testcase in POSCA testsuite", testcase)
         criteria = "FAIL"
@@ -131,6 +140,7 @@ def main():
     test_level = sys.argv[1]
     test_name = sys.argv[2]
     REPORT = sys.argv[3]
+    copy_hosts_file()
     testsuite_run(test_level, test_name, REPORT)