From dcd164e74e4f1a2de323cf8d10a0ea357edde13e Mon Sep 17 00:00:00 2001 From: Josef Skladanka Date: Wed, 11 Feb 2015 13:25:10 +0100 Subject: [PATCH] Fixed to use the current relval --- openqa_trigger/conf_test_suites.py | 11 ++++++++++- openqa_trigger/report_job_results.py | 10 ++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/openqa_trigger/conf_test_suites.py b/openqa_trigger/conf_test_suites.py index 83c7fc9..6a1ed1f 100644 --- a/openqa_trigger/conf_test_suites.py +++ b/openqa_trigger/conf_test_suites.py @@ -55,7 +55,7 @@ TESTCASES = { "type": "Installation", }, "QA:Testcase_Anaconda_updates.img_via_URL": { - "section": "Miscellaneous ", + "section": "Miscellaneous", "env": "Result", "type": "Installation", }, @@ -161,6 +161,15 @@ TESTSUITES = { "QA:Testcase_install_repository_HTTP/FTP_graphical", "QA:Testcase_Package_Sets_Minimal_Package_Install", ], + "server_repository_http_variation":[ + "QA:Testcase_Boot_default_install Server netinst", + "QA:Testcase_install_to_VirtIO", + "QA:Testcase_partitioning_guided_empty", + "QA:Testcase_Anaconda_User_Interface_Graphical", + "QA:Testcase_Anaconda_user_creation", + "QA:Testcase_install_repository_HTTP/FTP_variation", + "QA:Testcase_Package_Sets_Minimal_Package_Install", + ], "server_mirrorlist_http_variation":[ "QA:Testcase_Boot_default_install Server netinst", "QA:Testcase_install_to_VirtIO", diff --git a/openqa_trigger/report_job_results.py b/openqa_trigger/report_job_results.py index 75a19ec..31436a6 100644 --- a/openqa_trigger/report_job_results.py +++ b/openqa_trigger/report_job_results.py @@ -41,16 +41,17 @@ def get_passed_testcases(job_ids): def get_relval_commands(passed_testcases): - relval_template = "relval report-results --unmanned --result pass" + relval_template = "relval report-auto" commands = [] for key in passed_testcases: cmd_ = relval_template version, _, build, arch = key if version == 'rawhide': - cmd_ += ' --release "%s" --date "%s"' % tuple(build.split('_')) #"22_20150110" + cmd_ += ' --release "%s" --build Rawhide --version "%s"' % tuple(build.split('_')) #"22_20150110" elif version == 'branched': - cmd_ += ' --release "%s" --milestone "%s" --compose "%s"' % tuple(build.split('_')) #"22_Alpha_TC1" + #cmd_ += ' --release "%s" --milestone "%s" --compose "%s"' % tuple(build.split('_')) #"22_Alpha_TC1" + continue for tc_name in passed_testcases[key]: testcase = conf_test_suites.TESTCASES[tc_name] @@ -58,7 +59,8 @@ def get_relval_commands(passed_testcases): tc_type = testcase['type'] tc_section = testcase['section'] - commands.append('%s --env "%s" --testtype "%s" --section "%s" --testcase "%s"' % (cmd_, tc_env, tc_type, tc_section, tc_name)) + commands.append('%s --environment "%s" --testtype "%s" --section "%s" --testcase "%s" pass' % (cmd_, tc_env, tc_type, tc_section, tc_name)) + return commands