diff --git a/ci/tests/Jenkinsfile.e2e-prs b/ci/tests/Jenkinsfile.e2e-prs index 19f2b33990..1b59e594e6 100644 --- a/ci/tests/Jenkinsfile.e2e-prs +++ b/ci/tests/Jenkinsfile.e2e-prs @@ -61,6 +61,8 @@ pipeline { def extraPytestOpts = '' if (params.TR_CASE_IDS != '') { extraPytestOpts = "--run_testrail_ids='${params.TR_CASE_IDS}'" + } else { + extraPytestOpts = "-m \"${params.TEST_MARKERS}\"" } withCredentials([ @@ -100,7 +102,6 @@ pipeline { --numprocesses 9 \ --rerun_count=2 \ --testrail_report=True \ - -m \"${params.TEST_MARKERS}\" \ -k \"${params.KEYWORD_EXPRESSION}\" \ --apk=${params.APK_NAME} \ --build=PR-${params.PR_ID}-${utils.timestamp()} \ diff --git a/test/appium/support/testrail_report.py b/test/appium/support/testrail_report.py index efe28acc29..3aa60b1df7 100644 --- a/test/appium/support/testrail_report.py +++ b/test/appium/support/testrail_report.py @@ -185,7 +185,7 @@ class TestrailReport(BaseTestReport): results = self.post('add_results_for_cases/%s' % self.run_id, data={"results": data}) try: results[0] - except IndexError: + except (IndexError, KeyError): print("Got TestRail error when adding results: \n%s" % results) for test in all_tests: