diff options
author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2021-09-09 10:23:56 +0000 |
---|---|---|
committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2021-09-09 10:25:10 +0000 |
commit | 8761363ce29560e319e42cd6c3a6140343e29852 (patch) | |
tree | d9c7faa4d3126c29a2edef6a303767af56786b4d | |
parent | b36f60243ee71b0a6eadd5107a0d4f20c373c453 (diff) |
round-robin.sh: Remove handling of "==rr[update_baseline] rebase"
... which was never used.
Change-Id: Ic3725f43ab29e395fb5fa03636fb1c7acae2de5a
-rw-r--r-- | round-robin.sh | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/round-robin.sh b/round-robin.sh index b31132f0..afc1e23e 100644 --- a/round-robin.sh +++ b/round-robin.sh @@ -36,9 +36,7 @@ declare -gA rr # ignored) as new commit to base-artifacts, and update baseline # branches. This is useful for user projects, e.g., to generate # historical results for several toolchain versions. -# - rebase: treat results of this build as historically eldest, and -# rebase base-artifacts commits on top of this build's artifacts. -#rr[update_baseline]=update/reset/init/rebase +#rr[update_baseline]=update/reset/init/push # Target architecture to build for: arm or aarch64. #rr[target]="$target" @@ -595,22 +593,7 @@ check_regression () exit $EXTERNAL_FAIL fi - if [ x"${rr[update_baseline]}" = x"rebase" ]; then - # No-one ever used "rebase" mode. It's now obsoleted by custom ci_projects. - local base_artifacts_head base_artifacts_tail - base_artifacts_head=$(git -C base-artifacts rev-parse HEAD) - base_artifacts_tail=$(git -C base-artifacts rev-list --max-parents=0 HEAD) - git -C base-artifacts reset --hard $base_artifacts_tail - - ${rr[no_regression_p]} ${rr[top_artifacts]} base-artifacts & - if wait $!; then - echo "Current results are no better then the all-time-best results. \ -No reason to rebase base-artifacts." - false - fi - - git -C base-artifacts reset --hard $base_artifacts_head - else + if true; then # Generate comparison artifacts for update, reset, init and push modes. ${rr[no_regression_p]} base-artifacts ${rr[top_artifacts]} & if wait $!; then @@ -702,17 +685,11 @@ update_baseline () set -euf -o pipefail local amend="" - local rebase_head rebase_tail if [ x"${rr[update_baseline]}" = x"init" ]; then amend="--amend" elif [ x"${rr[update_baseline]}" = x"push" ]; then : - elif [ x"${rr[update_baseline]}" = x"rebase" ]; then - rebase_head=$(git -C base-artifacts rev-parse HEAD) - rebase_tail=$(git -C base-artifacts rev-list --max-parents=0 HEAD) - git -C base-artifacts reset --hard $rebase_tail - amend="--amend" else # ${rr[update_baseline]} == update, reset local prev_head="" @@ -790,13 +767,6 @@ BUILD_URL: ${BUILD_URL-$(pwd)} results: $(cat ${rr[top_artifacts]}/results)" - - if [ x"${rr[update_baseline]}" = x"rebase" ]; then - for rebase_tail in $(git -C base-artifacts rev-list --reverse $rebase_head); do - git -C base-artifacts checkout $rebase_tail -- . - git -C base-artifacts commit -C $rebase_tail - done - fi ) } @@ -809,10 +779,6 @@ push_baseline () git_init_linaro_local_remote base-artifacts baseline false git_push base-artifacts baseline ${rr[baseline_branch]} - if [ x"${rr[update_baseline]}" = x"rebase" ]; then - return - fi - local url local c for c in $(print_updated_components); do |