2 files changed, 17 insertions, 5 deletions

diff --git a/scripts/lib/build_perf/html/measurement_chart.html b/scripts/lib/build_perf/html/measurement_chart.html
index 05bd84e6ce..c39578702d 100644
--- a/scripts/lib/build_perf/html/measurement_chart.html
+++ b/scripts/lib/build_perf/html/measurement_chart.html
@@ -17,10 +17,10 @@
   }
 
   // Convert raw data to the format: [time, value]
-  const data = rawData.map(([commit, value, time]) => {
+  const data = rawData.map(([commit, value, time, commitnum]) => {
     return [
       // The Date object takes values in milliseconds rather than seconds. So to use a Unix timestamp we have to multiply it by 1000.
-      new Date(time * 1000).getTime(),
+      commit,
       // Assuming the array values are duration in the format [hours, minutes, seconds, milliseconds]
       updateValue(value)
     ]
@@ -49,7 +49,13 @@
       ;}
     },
     xAxis: {
-      type: 'time',
+      type: 'value',
+      min: function(value) {
+        return Math.round(value.min - 0.5);
+      },
+      max: function(value) {
+        return Math.round(value.max + 0.5);
+      }
     },
     yAxis: {
       name: '{{ measurement.value_type.quantity }}' == 'time' ? 'Duration in minutes' : 'Disk size in MB',
diff --git a/scripts/oe-build-perf-report b/scripts/oe-build-perf-report
index 6c3c726ee3..b38574caba 100755
--- a/scripts/oe-build-perf-report
+++ b/scripts/oe-build-perf-report
@@ -13,6 +13,7 @@ import logging
 import os
 import re
 import sys
+import subprocess
 from collections import namedtuple, OrderedDict
 from operator import attrgetter
 from xml.etree import ElementTree as ET
@@ -338,8 +339,13 @@ def print_html_report(data, id_comp, buildstats):
                 commit_num = get_data_item(meta, 'layers.meta.commit_count')
                 commit = get_data_item(meta, 'layers.meta.commit')
                 # Add start_time for both test measurement types of sysres and disk usage
-                start_time = test_i['start_time'][0]
-                samples.append(measurement_stats(meas_i, '', start_time))
+                try:
+                    commit_time = get_data_item(meta, 'layers.meta.commit_time')
+                except KeyError:
+                    output = subprocess.check_output(["git", "show", "--no-patch", "--format=%ct", commit], cwd="/home/richard/Repos/poky", text=True).strip()
+                    print("%s -> %s vs %s" % (commit_num, output + "." + str(commit_num).zfill(6), test_i['start_time'][0]))
+                    commit_time = output + "." + str(commit_num).zfill(6) #test_i['start_time'][0]
+                samples.append(measurement_stats(meas_i, '', commit_time))
                 samples[-1]['commit_num'] = commit_num
                 samples[-1]['commit'] = commit