tcwg-benchmark-results.sh: new results taken from artifacts

Change-Id: Ib825c79d67ed76b5e7681464ebfb069eb99201f9

1 files changed, 11 insertions, 9 deletions

diff --git a/tcwg_bmk-build.sh b/tcwg_bmk-build.sh
index c6d64bbd..848d48f3 100755
--- a/tcwg_bmk-build.sh
+++ b/tcwg_bmk-build.sh
@@ -402,25 +402,27 @@ compare_results ()
 	sudo /usr/lib/linux-tools/install-armhf-perf-workaround.sh
     fi
 
-    local results_dir
-    results_dir="$(mktemp -d -p /tmp)"
-    chmod g+wx $results_dir
+    local new_results ref_results
+    new_results="${rr[top_artifacts]}/annex/bmk-data"
+    assert_with_msg "Benchmarking succeeded, but annex/bmk-data results are missing" \
+		    [ -d $new_results ]
 
-    local new_results_id="${rr[top_artifacts]}/results_id"
-    local ref_results_id=base-artifacts/results_id
-    if [ ! -f $ref_results_id ] ; then
+    if [ ! -f base-artifacts/results_id ] ; then
 	# base-artifacts has no reference results. It doesn't have any results_id.
 	# This can happen on initialization of base-artifacts (update_baseline=init)
 	# or in corner-cases like forced build failing during toolchain build.
 	# In such cases we compare results to themselves just as an exercise.
-	ref_results_id=$new_results_id
+	ref_results=$new_results
+    else
+        # reference results to be retrieved before applying the comparison
+	ref_results="bkp-01.tcwglab:/home/tcwg-benchmark/results-$(cat base-artifacts/results_id)"
     fi
 
     # Compare vs previous run
     mkdir -p ${rr[top_artifacts]}/results-vs-prev
     ln -s ../results-vs-prev $run_step_artifacts/results-vs-prev
     $scripts/tcwg-benchmark-results.sh \
-        --results_ref "$(cat $ref_results_id)" ++results "$(cat $new_results_id)" \
+        --results_ref "$ref_results" ++results "$new_results" \
         --top_artifacts "${rr[top_artifacts]}/results-vs-prev" \
 	--verbose $verbose --hw_tag "$(tcwg_bmk_hw)" \
 	$compare_opts \
@@ -487,7 +489,7 @@ compare_results ()
     done
 
     assert_with_msg "Found a regression while comparing the build against itself" \
-			[ "$ref_results_id" != "$new_results_id" ]
+			[ "$ref_results" != "$new_results" ]
     )
 }