Rework handling of benchmarking results

This patch re-organizes benchmarking results as the following
/home/tcwg-benchmark/
  results-tk1/<job_name>-<build_num>/
    tcwg-bmk-tk1-06/
      <files>
    tcwg-bmk-tk1-07/
      <files>
    tcwg-bmk-tk1-08/
      <files>
  results-tx1/<job_name>-<build_num>/
    tcwg-bmk-tx1-06/
      <files>
    tcwg-bmk-tx1-07/
      <files>
    tcwg-bmk-tx1-08/
      <files>
This allows us to control access to results per board by
setting permissions on top-level directory.  Additionally,
we hard-code host for results as dev-01.tcwglab to disallow
forwarding of results to other hosts.

Parameter "resultsdest" is replaced by "results_id", which is
in form "<hw_type>/<job_name>-<build_num>", e.g.,
"tk1/tcwg-benchmark-christophe-123".  Results_id
is appended to dev-01.tcwglab:/home/tcwg-benchmark/results-$results_id
to construct path to the results.

The tcwg-benchmark-results job is being reworked to upload only
relative results to jenkins web UI.  The new "--relative" option
to csvs2table.py is not yet implemented, so the job is not yet working.

Change-Id: Ib0ff755ad122714bd9af3ba19cd57672ea081321

1 files changed, 14 insertions, 4 deletions

diff --git a/tcwg-benchmark-results.sh b/tcwg-benchmark-results.sh
index 00efe72f..03823a05 100755
--- a/tcwg-benchmark-results.sh
+++ b/tcwg-benchmark-results.sh
@@ -6,16 +6,26 @@ set -ex
 
 # Make shellcheck happy and workaround Jenkins not defining variables
 # for empty arguments.
-resultsdest="$resultsdest"
+results_id="$results_id"
 
 # Jenkins doesn't define variables when parameter value is empty (like cflags),
 # so enable "set -u" only after above binding of variables.
 set -u
 
-rsync -az --delete "$resultsdest/" results/
+results_top="dev-01.tcwglab:/home/tcwg-benchmark/results"
+
+rsync -az --delete "$results_top-$results_id/" results/
+rsync -az --delete "$results_top-$(dirname $results_id)/1/" baseline/
+
+for i in baseline results; do
+    bmk-scripts/perfdatadir2csv.sh --buildid-dir local -t --num 0 --format sample --results-dir "$i/" > "time-$i.csv"
+    bmk-scripts/perfdatadir2csv.sh --buildid-dir local --results-dir "$i/" > "sample-$i.csv"
+done
 
 mkdir -p artifacts
-bmk-scripts/perfdatadir2csv.sh --buildid-dir local -t --num 0 --format sample --results-dir results/ > artifacts/time.csv
-bmk-scripts/perfdatadir2csv.sh --buildid-dir local --results-dir results/ > artifacts/sample.csv
+
+bmk-scripts/csvs2table.py --relative time-baseline.csv time-results.csv > artifacts/time.csv
+
+bmk-scripts/csvs2table.py --relative sample-baseline.csv sample-results.csv > artifacts/sample.csv
 
 exit 0