summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2021-07-18 10:11:13 +0000
committerMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2021-07-18 10:11:13 +0000
commit38387e546855a9c6e9fa1d05732b26c8406c0a5b (patch)
tree3b06bc7bd616dcddab896fca618ed6434ac389cb
parentebf7321c7731d66df14a92fa4c23455f0dc48fdc (diff)
downloadjenkins-scripts-38387e546855a9c6e9fa1d05732b26c8406c0a5b.tar.gz
round-robin.sh: Simplify logic for cloning baseline repo
... and don't require component's baseline branch to exist when it's not going to be used. Change-Id: I693fcc3306b1ce95cd684ffe23724b5cf477be01
-rw-r--r--round-robin.sh20
1 files changed, 5 insertions, 15 deletions
diff --git a/round-robin.sh b/round-robin.sh
index d0c4c87e..e61edce5 100644
--- a/round-robin.sh
+++ b/round-robin.sh
@@ -177,22 +177,12 @@ clone_repo ()
local baseline_branch=${rr[baseline_branch]}
if [ x"${rr[${project}_branch]}" != x"baseline" ]; then
- if [ x"${rr[update_baseline]}" = x"init" ]; then
- # If rr[update_baseline] is "init", and we aren't going to use
- # the baseline branch, checkout always-present "empty" branch.
- # Later in push_baseline we will effectively initialize baseline
- # branches of components.
- baseline_branch=empty
- fi
- fi
-
- # Clone baseline remote
- clone_baseline_repo $project $baseline_branch $read_only
-
- if [ x"${rr[${project}_branch]}" != x"baseline" ]; then
# Fetch and checkout from the non-baseline repo.
- clone_or_update_repo $project $branch ${rr[${project}_url]} > /dev/null
- fi
+ clone_or_update_repo $project $branch ${rr[${project}_url]}
+ else
+ # Clone baseline remote
+ clone_baseline_repo $project $baseline_branch $read_only
+ fi > /dev/null
# Allow manifest override
if [ x"${rr[${project}_rev]-}" != x"" ]; then