From 824638d3e936bdb77799203d8e1ea37c95434404 Mon Sep 17 00:00:00 2001 From: "jose.lausuch" Date: Mon, 14 Dec 2015 16:41:24 +0100 Subject: Add a flag to push the results to the DB optionaly By default, it will NOT push, only if specified by -r The parameter must be taken from a Jenkins job set to TRUE JIRA: FUNCTEST-84 Change-Id: Iee3b293e90b052b88de2d4f1d337f5ec5e3b3941 Signed-off-by: jose.lausuch --- testcases/VIM/OpenStack/CI/libraries/run_tempest.py | 9 ++++++++- testcases/vIMS/CI/vIMS.py | 8 ++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) (limited to 'testcases') diff --git a/testcases/VIM/OpenStack/CI/libraries/run_tempest.py b/testcases/VIM/OpenStack/CI/libraries/run_tempest.py index 2d65df425..f80f4ae3e 100644 --- a/testcases/VIM/OpenStack/CI/libraries/run_tempest.py +++ b/testcases/VIM/OpenStack/CI/libraries/run_tempest.py @@ -28,6 +28,9 @@ parser.add_argument("repo_path", help="Path to the Functest repository") parser.add_argument("-d", "--debug", help="Debug mode", 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") args = parser.parse_args() @@ -131,7 +134,11 @@ def run_tempest(OPTION): "tests": int(num_tests), "failures": int(num_failures)} logger.info("Results: "+str(json_results)) pod_name = functest_utils.get_pod_name(logger) - push_results_to_db(json_results, MODE, pod_name) + + # Push results in payload of testcase + if args.report: + logger.debug("Push result into DB") + push_results_to_db(json_results, MODE, pod_name) def main(): diff --git a/testcases/vIMS/CI/vIMS.py b/testcases/vIMS/CI/vIMS.py index 05afa898b..91bec1f08 100644 --- a/testcases/vIMS/CI/vIMS.py +++ b/testcases/vIMS/CI/vIMS.py @@ -25,6 +25,9 @@ pp = pprint.PrettyPrinter(indent=4) parser = argparse.ArgumentParser() parser.add_argument("repo_path", help="Path to the repository") parser.add_argument("-d", "--debug", help="Debug mode", action="store_true") +parser.add_argument("-r", "--report", + help="Create json result file", + action="store_true") args = parser.parse_args() sys.path.append(args.repo_path + "testcases/") @@ -385,7 +388,8 @@ def test_clearwater(): except: logger.error("Unable to retrieve test results") - if vims_test_result != "": + if vims_test_result != "" & args.report: + logger.debug("Push result into DB") logger.debug("Pushing results to DB....") git_version = functest_utils.get_git_branch(args.repo_path) functest_utils.push_results_to_db(db_url=TEST_DB, case_name="vIMS", @@ -413,4 +417,4 @@ def main(): cleanup_deployments() if __name__ == '__main__': - main() \ No newline at end of file + main() -- cgit 1.2.3-korg