summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2021-07-10 17:35:24 +0000
committerMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2021-07-10 17:35:24 +0000
commit0f2ef62d12266989aee544affee2bd5cc4b6d0ea (patch)
treefc841481a3f3c6dd76a894575b4afa3f8b8fe93a
parentc9217545ee194839da63264a0ed9aeebc7481f9b (diff)
downloadjenkins-scripts-0f2ef62d12266989aee544affee2bd5cc4b6d0ea.tar.gz
round-robin.sh (clone_repo): Fix manifest override
Change-Id: I2686f4561ff29fb66d94eab9b85c23ccf86428d6
-rw-r--r--round-robin.sh8
1 files changed, 5 insertions, 3 deletions
diff --git a/round-robin.sh b/round-robin.sh
index 745c5e00..491c1655 100644
--- a/round-robin.sh
+++ b/round-robin.sh
@@ -164,9 +164,6 @@ clone_repo ()
branch="${rr[${project}_branch]}"
fi
- # Allow manifest override
- branch="${rr[${project}_rev]-$branch}"
-
# Decide on whether to use read-only or read-write mode for
# refs/remotes/baseline. We use read-only wherever possible to allow
# developers without ssh keys on Linaro git servers to reproduce builds
@@ -197,6 +194,11 @@ clone_repo ()
clone_or_update_repo $project $branch ${rr[${project}_url]} > /dev/null
fi
+ # Allow manifest override
+ if [ x"${rr[${project}_rev]-}" != x"" ]; then
+ git -C $project checkout --detach "${rr[${project}_rev]}"
+ fi
+
local cur_rev
cur_rev=$(git -C $project rev-parse HEAD)