Skip to content

Commit 2f4d668

Browse files
author
Brian Daniels
committed
Renamed Jenkins specific options to general "Build" options
1 parent 5eb4894 commit 2f4d668

File tree

4 files changed

+16
-15
lines changed

4 files changed

+16
-15
lines changed

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
---
2-
python:
1+
---
2+
python:
33
- "2.7"
44
script: "python workspace_tools/build_travis.py"
55
install:
66
- "sudo $TRAVIS_BUILD_DIR/travis/install_dependencies.sh > /dev/null"
77
- sudo pip install colorama
8-
- sudo pip install prettytable
8+
- sudo pip install prettytable
9+
- sudo pip install jinja2

workspace_tools/build_release.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
default=False, help="Verbose diagnostic output")
102102
parser.add_option("-t", "--toolchains", dest="toolchains", help="Use toolchains names separated by comma")
103103

104-
parser.add_option("", "--report-jenkins", dest="report_jenkins_file_name", help="Output the build results to an xml file that is readable by Jenkins")
104+
parser.add_option("", "--report-build", dest="report_build_file_name", help="Output the build results to an html file")
105105

106106

107107
options, args = parser.parse_args()
@@ -147,8 +147,8 @@
147147

148148
# Write summary of the builds
149149

150-
if options.report_jenkins_file_name:
151-
write_build_report(build_report, 'library_build/report.html', options.report_jenkins_file_name)
150+
if options.report_build_file_name:
151+
write_build_report(build_report, 'library_build/report.html', options.report_build_file_name)
152152

153153
print "\n\nCompleted in: (%.2f)s" % (time() - start)
154154

workspace_tools/singletest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ def get_version():
209209
_opts_log_file_name=opts.log_file_name,
210210
_opts_report_html_file_name=opts.report_html_file_name,
211211
_opts_report_junit_file_name=opts.report_junit_file_name,
212-
_opts_report_jenkins_file_name=opts.report_jenkins_file_name,
212+
_opts_report_build_file_name=opts.report_build_file_name,
213213
_test_spec=test_spec,
214214
_opts_goanna_for_mbed_sdk=opts.goanna_for_mbed_sdk,
215215
_opts_goanna_for_tests=opts.goanna_for_tests,

workspace_tools/test_api.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ def __init__(self,
154154
_opts_log_file_name=None,
155155
_opts_report_html_file_name=None,
156156
_opts_report_junit_file_name=None,
157-
_opts_report_jenkins_file_name=None,
157+
_opts_report_build_file_name=None,
158158
_test_spec={},
159159
_opts_goanna_for_mbed_sdk=None,
160160
_opts_goanna_for_tests=None,
@@ -207,7 +207,7 @@ def __init__(self,
207207
self.opts_log_file_name = _opts_log_file_name
208208
self.opts_report_html_file_name = _opts_report_html_file_name
209209
self.opts_report_junit_file_name = _opts_report_junit_file_name
210-
self.opts_report_jenkins_file_name = _opts_report_jenkins_file_name
210+
self.opts_report_build_file_name = _opts_report_build_file_name
211211
self.opts_goanna_for_mbed_sdk = _opts_goanna_for_mbed_sdk
212212
self.opts_goanna_for_tests = _opts_goanna_for_tests
213213
self.opts_shuffle_test_order = _opts_shuffle_test_order
@@ -1438,9 +1438,9 @@ def singletest_in_cli_mode(single_test):
14381438
# Export results in form of JUnit XML report to separate file
14391439
report_exporter = ReportExporter(ResultExporterType.JUNIT)
14401440
report_exporter.report_to_file(test_summary_ext, single_test.opts_report_junit_file_name, test_suite_properties=test_suite_properties_ext)
1441-
if single_test.opts_report_jenkins_file_name:
1442-
# Export build results as Jenkins XML report ti sparate file
1443-
write_build_report(build_report, 'tests_build/report.html', single_test.opts_report_jenkins_file_name)
1441+
if single_test.opts_report_build_file_name:
1442+
# Export build results as html report to sparate file
1443+
write_build_report(build_report, 'tests_build/report.html', single_test.opts_report_build_file_name)
14441444

14451445

14461446
class TestLogger():
@@ -1811,9 +1811,9 @@ def get_default_test_options_parser():
18111811
dest='report_junit_file_name',
18121812
help='You can log test suite results in form of JUnit compliant XML report')
18131813

1814-
parser.add_option("", "--report-jenkins",
1815-
dest="report_jenkins_file_name",
1816-
help="Output the build results to an xml file that is readable by Jenkins")
1814+
parser.add_option("", "--report-build",
1815+
dest="report_build_file_name",
1816+
help="Output the build results to an html file")
18171817

18181818
parser.add_option('', '--verbose-skipped',
18191819
dest='verbose_skipped_tests',

0 commit comments

Comments
 (0)