diff options
| author | Laurent Alfonsi <laurent.alfonsi@linaro.org> | 2023-07-06 11:20:41 +0200 |
|---|---|---|
| committer | Laurent Alfonsi <laurent.alfonsi@linaro.org> | 2023-07-07 13:39:42 +0000 |
| commit | 14a3d38ead1b75e56377e6c9f83a68926f018145 (patch) | |
| tree | d8dca0de70ce1196322b8748dd29a6adbd1e68ed /tcwg_bmk-build.sh | |
| parent | 5c0178179d1a2e0dc6e440627d1e8d83e8e778ef (diff) | |
tcwg_bmk-build.sh: Revert storing bmk-data in annex
.. now store in /home/tcwg-benchmark/results-xxx only if successful (in
round-robin-baseline.sh)
Change-Id: Ic700c3c8dbfefff84cb386259f54cbd70147c3f7
Diffstat (limited to 'tcwg_bmk-build.sh')
| -rwxr-xr-x | tcwg_bmk-build.sh | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/tcwg_bmk-build.sh b/tcwg_bmk-build.sh index 381e4358..6b809ef7 100755 --- a/tcwg_bmk-build.sh +++ b/tcwg_bmk-build.sh @@ -403,34 +403,17 @@ compare_results () fi local results_ref results_new - results_new="${rr[top_artifacts]}/annex/bmk-data" + results_dir="$(mktemp -d -p /tmp)" + chmod g+wx $results_dir + local new_results_id="${rr[top_artifacts]}/results_id" local ref_results_id=base-artifacts/results_id - if ! [ -f $ref_results_id ] && ! [ -d "base-artifacts/annex/bmk-data" ]; then - # base-artifacts has no reference results, neither in results_id nor in annex + if [ ! -f $ref_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. - results_ref=$results_new - elif [ -d "base-artifacts/annex/bmk-data" ]; then - # Results are part of the annex of the base-artifacts - results_ref="base-artifacts/annex/bmk-data" - # Import this annex locally - git -C base-artifacts annex init bkp-01 - git_set_remote base-artifacts "bkp-01" \ - "ssh://bkp-01.tcwglab/home/tcwg-buildslave/base-artifacts" - git -C base-artifacts annex copy --from=bkp-01 annex/ - assert_with_msg "ERROR: bmk-results is broken $results_ref" \ - [ x"$(find base-artifacts/annex -xtype l |wc -l)" == x"0" ] - else - # FIXME : - # Otherwise, getting it from bkp-01:/home/tcwg-benchmark/results-. - # Probably a builds not using bmk results in annex dir. - # This may be useless at some point, once all results are part of base-artifacts annex. - results_ref="base-artifacts/annex/bmk-data" - mkdir -p $results_ref - rsync -az --delete "bkp-01.tcwglab:/home/tcwg-benchmark/results-$(cat $ref_results_id)/" \ - $results_ref/ + ref_results_id=$new_results_id fi assert_with_msg "ERROR: No result dir $results_new" [ -d $results_new ] @@ -440,7 +423,7 @@ compare_results () 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 $results_ref ++results $results_new \ + --results_ref $ref_results_id ++results $new_results_id \ --top_artifacts "${rr[top_artifacts]}/results-vs-prev" \ --verbose $verbose --hw_tag "$(tcwg_bmk_hw)" \ $compare_opts \ |