Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
CSIT-1351: Add Denverton results to report
[csit.git]
/
resources
/
tools
/
presentation
/
generator_report.py
diff --git
a/resources/tools/presentation/generator_report.py
b/resources/tools/presentation/generator_report.py
index
dd200fa
..
6739779
100644
(file)
--- a/
resources/tools/presentation/generator_report.py
+++ b/
resources/tools/presentation/generator_report.py
@@
-91,7
+91,7
@@
HTML_BUILDER = 'sphinx-build -v -c . -a ' \
'-b html -E ' \
'-t html ' \
'-D release={release} ' \
'-b html -E ' \
'-t html ' \
'-D release={release} ' \
- '-D version="
Report v{report_version} -
{date}" ' \
+ '-D version="
Test Report
{date}" ' \
'{working_dir} ' \
'{build_dir}/'
'{working_dir} ' \
'{build_dir}/'
@@
-100,7
+100,7
@@
PDF_BUILDER = 'sphinx-build -v -c . -a ' \
'-b latex -E ' \
'-t latex ' \
'-D release={release} ' \
'-b latex -E ' \
'-t latex ' \
'-D release={release} ' \
- '-D version="
Report v{report_version} -
{date}" ' \
+ '-D version="
Test Report
{date}" ' \
'{working_dir} ' \
'{build_dir}'
'{working_dir} ' \
'{build_dir}'
@@
-157,7
+157,7
@@
def generate_html_report(release, spec, versions, report_version):
cmd = HTML_BUILDER.format(
release=release,
report_version=report_version,
cmd = HTML_BUILDER.format(
release=release,
report_version=report_version,
- date=datetime.datetime.utcnow().strftime('%
m/%d/%Y
%H:%M UTC'),
+ date=datetime.datetime.utcnow().strftime('%
Y-%m-%d
%H:%M UTC'),
working_dir=working_dir,
build_dir=spec.environment["paths"]["DIR[BUILD,HTML]"])
execute_command(cmd)
working_dir=working_dir,
build_dir=spec.environment["paths"]["DIR[BUILD,HTML]"])
execute_command(cmd)
@@
-212,7
+212,7
@@
def generate_pdf_report(release, spec, versions, report_version):
cmd = PDF_BUILDER.format(
release=release,
report_version=report_version,
cmd = PDF_BUILDER.format(
release=release,
report_version=report_version,
- date=datetime.datetime.utcnow().strftime('%
m/%d/%Y
%H:%M UTC'),
+ date=datetime.datetime.utcnow().strftime('%
Y-%m-%d
%H:%M UTC'),
working_dir=working_dir,
build_dir=build_dir)
execute_command(cmd)
working_dir=working_dir,
build_dir=build_dir)
execute_command(cmd)
@@
-227,7
+227,7
@@
def generate_pdf_report(release, spec, versions, report_version):
'pdflatex -interaction nonstopmode csit.tex || true'.
format(build_dir=build_dir),
'cd {build_dir} && '
'pdflatex -interaction nonstopmode csit.tex || true'.
format(build_dir=build_dir),
'cd {build_dir} && '
- 'cp csit.pdf ../{archive_dir}/csit_{release}_
v
{report_version}.pdf &&'
+ 'cp csit.pdf ../{archive_dir}/csit_{release}_{report_version}.pdf &&'
'cp csit.pdf ../{archive_dir}/csit_{release}.pdf'.
format(build_dir=build_dir,
archive_dir=archive_dir,
'cp csit.pdf ../{archive_dir}/csit_{release}.pdf'.
format(build_dir=build_dir,
archive_dir=archive_dir,
@@
-264,7
+264,7
@@
def _convert_all_svg_to_pdf(path):
:type path: str
"""
:type path: str
"""
- cmd = "inkscape -D -z --file={svg} --export-pdf={pdf}
--export-latex
"
+ cmd = "inkscape -D -z --file={svg} --export-pdf={pdf}"
svg_files = get_files(path, "svg", full_path=True)
for svg_file in svg_files:
svg_files = get_files(path, "svg", full_path=True)
for svg_file in svg_files: