Skip to content

Commit

Permalink
Merge 6d645f7 into 9bb4d0f
Browse files Browse the repository at this point in the history
  • Loading branch information
dianaclarke committed May 4, 2021
2 parents 9bb4d0f + 6d645f7 commit 3ae522a
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 0 deletions.
4 changes: 4 additions & 0 deletions conbench/app/compare.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ def page(self, comparisons, regressions, improvements, baseline_id, contender_id
contender_run_id = comparisons[0]["contender_run_id"]
compare = f"{baseline_run_id}...{contender_run_id}"
compare_runs_url = f.url_for("app.compare-runs", compare_ids=compare)
elif comparisons and self.type == "run":
baseline_run_id, contender_run_id = baseline_id, contender_id
elif comparisons and self.type == "benchmark":
baseline = self.get_display_benchmark(baseline_id)
contender = self.get_display_benchmark(contender_id)
Expand All @@ -36,6 +38,8 @@ def page(self, comparisons, regressions, improvements, baseline_id, contender_id
compare_runs_url = f.url_for("app.compare-runs", compare_ids=compare)
compare = f'{b_stats["batch_id"]}...{c_stats["batch_id"]}'
compare_batches_url = f.url_for("app.compare-batches", compare_ids=compare)

if comparisons:
baseline_run = self.get_display_run(baseline_run_id)
contender_run = self.get_display_run(contender_run_id)

Expand Down
18 changes: 18 additions & 0 deletions conbench/templates/compare-list.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,24 @@
</ol>
</nav>

{% if baseline_run and contender_run %}
<div class="row">
<div class="col-md-12">
<ul class="list-group">
<li class="list-group-item" align="right" style="border-style:none">
Baseline:
<a href="{{ baseline_run.commit.url }}">{{ baseline_run.commit.message }}</a>
<small>({{ baseline_run.commit.display_timestamp }})</small>
<br/>
Contender:
<a href="{{ contender_run.commit.url }}">{{ contender_run.commit.message }}</a>
<small>({{ contender_run.commit.display_timestamp }})</small>
</li>
</ul>
</div>
</div>
{% endif %}

<div class="row">
<div class="col-md-12">
<table id="benchmarks" class="table table-striped table-bordered table-hover">
Expand Down

0 comments on commit 3ae522a

Please sign in to comment.