diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2019-01-20 09:37:50 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2019-01-22 13:40:46 +0000 |
| commit | cb9f3c0be4f69e25b172b3591477d4cddf5adb2b (patch) | |
| tree | 6344c76550408fe92a96d3153632c40380de93d2 /tcwg_kernel-build.sh | |
| parent | 32e2f0a24eebd8dc1222b77c1b9ce2ef43c8ac87 (diff) | |
tcwg_kernel*: Correct names of *_rev variables.
At the moment *_rev variables, such as current_rev, accept
both git branches and git revisions (SHA1s) as values, which is
confusing and makes it difficult to write code for manifest generation
(manifests need all GIT references resolved at the moment of
generation so that reproduction runs sees the "old" state of
world).
This change standardize the meaning of *_branch and
*_rev suffices: *_branch variables accept either SHA1s or git
branches and *_rev variables accept only SHA1s.
With the established meanings, $bad_rev and $baseline_rev parameters of
tcwg_kernel-bisect.sh script can only be SHA1s (which they are anyway
in all reasonable cases), which allowed to simplify handling of a few
things in tcwg_kernel-bisect.sh script.
Change-Id: Ifc52385e4d3aeab2a3b6945fa6e1c88bcc2c7b6d
Diffstat (limited to 'tcwg_kernel-build.sh')
| -rwxr-xr-x | tcwg_kernel-build.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tcwg_kernel-build.sh b/tcwg_kernel-build.sh index 8b0e6a09..d31329e9 100755 --- a/tcwg_kernel-build.sh +++ b/tcwg_kernel-build.sh @@ -11,27 +11,27 @@ convert_args_to_variables "$@" mode="${mode-baseline}" obligatory_variables toolchain \ - rr[linux_version] rr[linux_url] rr[linux_rev] + rr[linux_version] rr[linux_url] rr[linux_branch] # Toolchain to use: gnu or llvm case "$toolchain" in "gnu") obligatory_variables rr[gnu_version] \ - rr[binutils_url] rr[binutils_rev] \ - rr[gcc_url] rr[gcc_rev] ;; + rr[binutils_url] rr[binutils_branch] \ + rr[gcc_url] rr[gcc_branch] ;; "llvm") obligatory_variables rr[llvm_version] \ - rr[llvm_url] rr[llvm_rev] ;; + rr[llvm_url] rr[llvm_branch] ;; esac case "$mode" in "jenkins-full") - obligatory_variables current_project current_rev + obligatory_variables current_project current_branch ;; esac # Set custom revision for one of the projects, and use baseline revisions # for all other projects. current_project="${current_project-none}" -current_rev="${current_rev-default}" +current_branch="${current_branch-default}" linux_config="${linux_config-defconfig}" reset_baseline="${reset_baseline-false}" @@ -96,7 +96,7 @@ run_step_init "$start_at" "$finish_at" "$top_artifacts" "$base_artifacts_opt" "$ rr[baseline_branch]="linaro-local/ci/tcwg_kernel/$toolchain-${rr[${toolchain}_version]}-$target-${rr[linux_version]}-$linux_config" rr[current_project]="$current_project" -rr[current_rev]="$current_rev" +rr[current_branch]="$current_branch" rr[mode]="$mode" rr[reset_baseline]="$reset_baseline" rr[target]="$target" |