X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_report.py;h=13ca75c1b9cb5d8362751925631a93a1a1dd493e;hp=dd200fa622286e783d44d5ae3a3c474e33e584a5;hb=0ca4a9ec1a8fc53a679b1c635a6e1b6afae0299d;hpb=903cb9f7dd664c5bc87f3295dd600d6cb23bf8ca

diff --git a/resources/tools/presentation/generator_report.py b/resources/tools/presentation/generator_report.py
index dd200fa622..13ca75c1b9 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,20 +100,20 @@ 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}'
 
 
-def generate_report(release, spec, report_version):
+def generate_report(release, spec, report_week):
     """Generate all formats and versions of the report.
 
     :param release: Release string of the product.
     :param spec: Specification read from the specification file.
-    :param report_version: Version of the report.
+    :param report_week: Calendar week when the report is published.
     :type release: str
     :type spec: Specification
-    :type report_version: str
+    :type report_week: str
     """
 
     logging.info("Generating the report ...")
@@ -124,10 +124,9 @@ def generate_report(release, spec, report_version):
     }
 
     for report_format, versions in spec.output["format"].items():
-        report[report_format](release, spec, versions, report_version)
+        report[report_format](release, spec, versions, report_week)
 
     archive_input_data(spec)
-    archive_report(spec)
 
     logging.info("Done.")
 
@@ -156,8 +155,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('%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)
@@ -173,17 +171,17 @@ def generate_html_report(release, spec, versions, report_version):
     logging.info("  Done.")
 
 
-def generate_pdf_report(release, spec, versions, report_version):
+def generate_pdf_report(release, spec, versions, report_week):
     """Generate html format of the report.
 
     :param release: Release string of the product.
     :param spec: Specification read from the specification file.
     :param versions: List of versions to generate. Not implemented yet.
-    :param report_version: Version of the report.
+    :param report_week: Calendar week when the report is published.
     :type release: str
     :type spec: Specification
     :type versions: list
-    :type report_version: str
+    :type report_week: str
     """
 
     logging.info("  Generating the pdf report, give me a few minutes, please "
@@ -211,8 +209,7 @@ def generate_pdf_report(release, spec, versions, report_version):
     build_dir = spec.environment["paths"]["DIR[BUILD,LATEX]"]
     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)
@@ -227,12 +224,12 @@ 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}.{week}.pdf &&'
         'cp csit.pdf ../{archive_dir}/csit_{release}.pdf'.
         format(build_dir=build_dir,
                archive_dir=archive_dir,
                release=release,
-               report_version=report_version)
+               week=report_week)
     ]
 
     for cmd in cmds:
@@ -264,7 +261,7 @@ def _convert_all_svg_to_pdf(path):
     :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: