summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2021-07-20 07:59:31 +0000
committerMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2021-07-20 09:47:14 +0000
commit85c1c90af3e827b9d785e65d4828c63a1dc64163 (patch)
treef8539e819a8444718954c84369b8c3b17a3e7b45
parent60db991ac6b6e3404d076c0c50208462fd024ba6 (diff)
[NFC] round-robin.sh: Cleanup reset_artifacts()
Change-Id: I2f1ade4f2ad10f2aba446f2c7c1fe3a04623ffff
-rw-r--r--round-robin.sh8
1 files changed, 3 insertions, 5 deletions
diff --git a/round-robin.sh b/round-robin.sh
index 5faa1d03..2b5b029d 100644
--- a/round-robin.sh
+++ b/round-robin.sh
@@ -121,19 +121,17 @@ reset_artifacts ()
$run_step_artifacts/console.log \
"$run_step_top_artifacts/jenkins/*"
- local single_branch=${rr[baseline_branch]}
-
# Clone base-artifacts here so that bisect runs (which skip this step)
# don't overwrite it.
# base-artifacts repo is big and changes all the time, so we
# fetch only the $baseline_branch, instead of all branches.
+ local single_branch
if [ x"${rr[update_baseline]}" = x"init" ]; then
- # shellcheck disable=SC2154
- rr[base-artifacts_rev]=empty
single_branch=empty
else
- rr[base-artifacts_rev]="${rr[base-artifacts_rev]-${rr[baseline_branch]}}"
+ single_branch=${rr[baseline_branch]}
fi
+ rr[base-artifacts_rev]="${rr[base-artifacts_rev]-$single_branch}"
clone_or_update_repo base-artifacts ${rr[base-artifacts_rev]} https://git-us.linaro.org/toolchain/ci/base-artifacts.git auto $single_branch
cat <<EOF | manifest_out