From cfa25394cbea615fa0eacf23be5c02f58aca9459 Mon Sep 17 00:00:00 2001 From: Alexander Maretskiy Date: Fri, 7 Oct 2016 14:48:16 +0300 Subject: [PATCH] [Reports] Get rid of Mako in reports, finally This transforms the last Mako template into Jinja2 markup and completely removes Mako support. This is the final step of switching to usage of Jinja2. Change-Id: I8b0ebe291e92f566d947d0e3e56614270e56c113 --- tests/ci/rally-gate.sh | 2 +- tests/ci/render.py | 2 +- tests/ci/wip-rally-gate.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/ci/rally-gate.sh b/tests/ci/rally-gate.sh index f7548161..61156118 100755 --- a/tests/ci/rally-gate.sh +++ b/tests/ci/rally-gate.sh @@ -109,7 +109,7 @@ python $BASE/new/rally/tests/ci/osresources.py\ rally -v --rally-debug task start --task $TASK $TASK_ARGS mkdir -p rally-plot/extra -python $BASE/new/rally/tests/ci/render.py ci/index.mako > rally-plot/extra/index.html +python $BASE/new/rally/tests/ci/render.py ci/index.html > rally-plot/extra/index.html cp $TASK rally-plot/task.txt tar -czf rally-plot/plugins.tar.gz -C $RALLY_PLUGINS_DIR . rally task results | python -m json.tool > rally-plot/results.json diff --git a/tests/ci/render.py b/tests/ci/render.py index a08723f8..2c4419c1 100644 --- a/tests/ci/render.py +++ b/tests/ci/render.py @@ -22,7 +22,7 @@ from rally.ui import utils HELP_MESSAGE = ( "Usage:\n\t" - "render.py ci/template.mako" + "render.py ci/template.html" "[= = ...]\n\n\t" "Where key-1,value-1 and key-2,value-2 are key pairs of template.") diff --git a/tests/ci/wip-rally-gate.py b/tests/ci/wip-rally-gate.py index 858b23f7..37930cef 100755 --- a/tests/ci/wip-rally-gate.py +++ b/tests/ci/wip-rally-gate.py @@ -180,7 +180,7 @@ def main(): else: print("Ignoring file %s" % fname) print("Exit statuses: %r" % statuses) - template = utils.get_template("ci/index.mako") + template = utils.get_template("ci/index.html") with open("rally-plot/extra/index.html", "w") as output: output.write(template.render()) return any(statuses)