X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=testsuites%2Frun_testsuite.py;h=e72766897b6176dcf18fc198ee538ef908205a2f;hb=1baf04d3b5f2348977dc3481fd2dd5fac181d84c;hp=bc255c46259a500778b531ccb89afaf799136e30;hpb=5eb95eff44e5e2ed35dc04cfe73549a8a160d8ce;p=bottlenecks.git

diff --git a/testsuites/run_testsuite.py b/testsuites/run_testsuite.py
index bc255c46..e7276689 100644
--- a/testsuites/run_testsuite.py
+++ b/testsuites/run_testsuite.py
@@ -52,7 +52,7 @@ def report(testcase, start_date, stop_date, criteria, details_doc):
         "description": ("test results for " + testcase),
         "pod_name": os.environ.get('NODE_NAME', 'unknown'),
         "installer": os.environ.get('INSTALLER_TYPE', 'unknown'),
-        "version": os.environ.get('BRANCH', 'unknown'),
+        "version": os.path.basename(os.environ.get('BRANCH', 'unknown')),
         "build_tag": os.environ.get('BUILD_TAG', 'unknown'),
         "stop_date": str(stop_date),
         "start_date": str(start_date),
@@ -60,12 +60,11 @@ def report(testcase, start_date, stop_date, criteria, details_doc):
         "scenario": os.environ.get('DEPLOY_SCENARIO', 'unknown')
     }
     results['details'] = {"test_results": details_doc}
-
     target = os.environ.get(
-        'REPORTING_DB',
+        'BOTTLENECKS_DB_TARGET',
         'http://testresults.opnfv.org/test/api/v1/results')
+    print ('Address of the target DB is: %s.' % target)
     timeout = 5
-
     try:
         LOG.debug('Test result : %s', jsonutils.dump_as_bytes(results))
         res = requests.post(target,
@@ -108,11 +107,15 @@ 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])
-        posca_testcase_run(tester_parser[0], testcase, config[testcase])
+        try:
+            posca_testcase_run(tester_parser[0], testcase, config[testcase])
+        except Exception, e:
+            LOG.warning('e.message:\t', e.message)
         stop_date = datetime.datetime.now()
         LOG.info("End of %s testcase in POSCA testsuite", testcase)
         criteria = "FAIL"
         if REPORT == "True":
+            print ('Testing results are about to be sent to the target DB.')
             details_doc = []
             if os.path.exists(config[testcase]['out_file']):
                 with open(config[testcase]['out_file']) as details_result:
@@ -120,6 +123,8 @@ def testsuite_run(test_level, test_name, REPORT="False"):
                     if len(details_doc):
                         criteria = "PASS"
             report(testcase, start_date, stop_date, criteria, details_doc)
+        else:
+            print ('Testing results have not been sent to the target DB.')
 
 
 def main():