diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2019-02-28 06:48:08 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2019-03-06 12:41:12 +0000 |
| commit | 849ca36d4278b0799f7a3baf5285a741aff95463 (patch) | |
| tree | 61818b6fa9687fbab73a73a7e0b41da9f1649cd9 | |
| parent | 6020c1f07668bf5df0c3dd0236fd3113898efc56 (diff) | |
tcwg_bmk-build.sh: Fetch bmk results_id from artifacts
... which will give path with @build_num@ resolved.
Note that setting results_id=... in benchmark() doesn't override
the global value of results_id.
Change-Id: I0708db2b56d1683845050c6d5fd9bb4f5cd2933d
| -rwxr-xr-x | tcwg_bmk-build.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tcwg_bmk-build.sh b/tcwg_bmk-build.sh index 2bb43e6b..73aa4ddb 100755 --- a/tcwg_bmk-build.sh +++ b/tcwg_bmk-build.sh @@ -137,8 +137,8 @@ benchmark () | grep SUCCESS \ | sed -e "s/.*#\([0-9]\+\)-.*/\1/") - results_id=$(echo "$results_id" | sed -e "s/@build_num@/$build_num/g") - echo "$results_id" > "${rr[top_artifacts]}/results_id" + echo "$results_id" | sed -e "s/@build_num@/$build_num/g" \ + > "${rr[top_artifacts]}/results_id" ) } @@ -162,12 +162,15 @@ no_regression_p () if ! [ -f base-artifacts/results_id ]; then return 0 + elif ! [ -f ${rr[top_artifacts]}/results_id ]; then + return 1 fi - local results_ref + local results_ref results_new results_ref=$(cat base-artifacts/results_id) + results_new=$(cat ${rr[top_artifacts]}/results_id) - $scripts/tcwg-benchmark-results.sh --results_ref $results_ref --results_id $results_id --top_artifacts "${rr[top_artifacts]}" --verbose $verbose + $scripts/tcwg-benchmark-results.sh --results_ref $results_ref --results_id $results_new --top_artifacts "${rr[top_artifacts]}" --verbose $verbose # Skip header line tail -n +2 ${rr[top_artifacts]}/results.csv | \ |