From: Ace Lee <liyin11@huawei.com>
Date: Wed, 11 Oct 2017 09:22:49 +0000 (+0000)
Subject: Merge "Bottlenecks testpmd scale-up testcase."
X-Git-Tag: opnfv-5.0.0~6
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=1ddcbed821e841c032aa2f1a4dfc3714716e83b8;hp=c0dc0572a4bf4bfc308b9d9ff5072468b9995d3c;p=bottlenecks.git

Merge "Bottlenecks testpmd scale-up testcase."
---

diff --git a/testsuites/run_testsuite.py b/testsuites/run_testsuite.py
index 8c8f6996..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),
@@ -107,7 +107,10 @@ 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"