diff options
| -rw-r--r-- | round-robin.sh | 8 |
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 |