summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2019-01-19 14:26:13 +0000
committerMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2019-01-21 14:27:28 +0000
commit0fc62db745c77966ed6ac58c56e166946216f11b (patch)
treee0a8a65f4d8ca5fe967245528894610bdc607284
parent0c835eb199b4627685e1b747bdfdeab0ec3fe221 (diff)
tcwg_kernel-build.sh: Simplify reproduction logic
Remove "reproduce" mode and follow the manifest. Use dedicated variables for storing projects' SHA1s' in the manifest in clone_repo like we do in all other places. Change-Id: I5407c403cd553bb6103addda0829ba8d0f0869cb
-rw-r--r--round-robin.sh6
-rwxr-xr-xtcwg_kernel-build.sh8
2 files changed, 4 insertions, 10 deletions
diff --git a/round-robin.sh b/round-robin.sh
index 45190df0..01054272 100644
--- a/round-robin.sh
+++ b/round-robin.sh
@@ -94,12 +94,12 @@ clone_repo ()
else
branch=${rr[current_rev]}
fi
- elif [ x"${rr[mode]}" = x"reproduce" ]; then
- branch="${rr[${project}_rev]}"
else
branch="refs/remotes/baseline/${rr[baseline_branch]}"
fi
+ branch="${rr[${project}_sha1]-$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
@@ -121,7 +121,7 @@ clone_repo ()
cur_rev=$(git -C $project rev-parse HEAD)
cat <<EOF | manifest_out
-rr[${project}_rev]=$cur_rev
+rr[${project}_sha1]=$cur_rev
EOF
if [ x"$project" = x"${rr[current_project]}" ]; then
diff --git a/tcwg_kernel-build.sh b/tcwg_kernel-build.sh
index 555e552c..8b0e6a09 100755
--- a/tcwg_kernel-build.sh
+++ b/tcwg_kernel-build.sh
@@ -7,7 +7,7 @@ scripts=$(dirname $0)
convert_args_to_variables "$@"
-# Execution mode: baseline, bisect, continue, jenkins-full, reproduce
+# Execution mode: baseline, bisect, continue, jenkins-full
mode="${mode-baseline}"
obligatory_variables toolchain \
@@ -28,11 +28,6 @@ case "$mode" in
;;
esac
-cat <<EOF | manifest_out
-declare -g mode=reproduce
-declare -g current_project=none
-EOF
-
# Set custom revision for one of the projects, and use baseline revisions
# for all other projects.
current_project="${current_project-none}"
@@ -82,7 +77,6 @@ case "$mode" in
esac
;;
"jenkins-full") ;;
- "reproduce") default_finish_at="check_regression" ;;
esac
if [ x"$start_at" = x"default" ]; then