X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_report.py;h=a7b2d64af01d8a73e15af3489a8d452dc4650ee3;hp=0fff90a204e7afd595f52c1019894b2df6334a0b;hb=32bb9cfcffcfbe6ec68d8469ebc8194580b31689;hpb=d1735e8a571722ef47ef9da3fe297e517a784f5c diff --git a/resources/tools/presentation/generator_report.py b/resources/tools/presentation/generator_report.py index 0fff90a204..a7b2d64af0 100644 --- 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} ' \ - '-D version="Report v{report_version} - {date}" ' \ + '-D version="Test Report {date}" ' \ '{working_dir} ' \ '{build_dir}/' @@ -100,7 +100,7 @@ PDF_BUILDER = 'sphinx-build -v -c . -a ' \ '-b latex -E ' \ '-t latex ' \ '-D release={release} ' \ - '-D version="Report v{report_version} - {date}" ' \ + '-D version="Test Report {date}" ' \ '{working_dir} ' \ '{build_dir}' @@ -127,7 +127,6 @@ def generate_report(release, spec, report_version): report[report_format](release, spec, versions, report_version) archive_input_data(spec) - archive_report(spec) logging.info("Done.") @@ -157,7 +156,7 @@ def generate_html_report(release, spec, versions, report_version): cmd = HTML_BUILDER.format( release=release, report_version=report_version, - date=datetime.datetime.utcnow().strftime('%Y-%m-%dT%H:%MZ'), + 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) @@ -212,7 +211,7 @@ def generate_pdf_report(release, spec, versions, report_version): cmd = PDF_BUILDER.format( release=release, report_version=report_version, - date=datetime.datetime.utcnow().strftime('%Y-%m-%dT%H:%MZ'), + date=datetime.datetime.utcnow().strftime('%Y-%m-%d %H:%M UTC'), working_dir=working_dir, build_dir=build_dir) execute_command(cmd) @@ -227,7 +226,7 @@ def generate_pdf_report(release, spec, versions, report_version): '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,