diff options
author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-12-11 09:14:49 +0000 |
---|---|---|
committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-12-12 09:42:42 +0000 |
commit | 57c1064e500cbffedadbb442cc51dbeab134f418 (patch) | |
tree | 1eddd8391df74836a0e11e0090ba26caac1fc818 | |
parent | db28669aad424728a62cffd2fefe638605c118e9 (diff) |
tcwg_kernel*: Rename config[*] to rr[*].
This is beginning of a massive variable renaming patch series.
The goal is to encapsulate all configuration variables that
round-robin routines are using into "rr" associative array.
This encapsulation will allow to move round-robin routines
such as clone_repo, prepare_abe, build_abe, etc. into helper
file and make it depend on a well-documented array of
configuration variables "rr".
Change-Id: Ie8aad82c1527ced79465fa8d21a1eaa0b11f5e7b
-rwxr-xr-x | tcwg_kernel-bisect.sh | 2 | ||||
-rwxr-xr-x | tcwg_kernel-build.sh | 8 | ||||
-rw-r--r-- | tcwg_kernel/gnu-master.sh | 4 | ||||
-rw-r--r-- | tcwg_kernel/gnu-release.sh | 4 | ||||
-rw-r--r-- | tcwg_kernel/linux-lts.sh | 4 | ||||
-rw-r--r-- | tcwg_kernel/linux-mainline.sh | 4 | ||||
-rw-r--r-- | tcwg_kernel/linux-next.sh | 4 | ||||
-rw-r--r-- | tcwg_kernel/linux-stable.sh | 4 | ||||
-rw-r--r-- | tcwg_kernel/llvm-master.sh | 4 | ||||
-rw-r--r-- | tcwg_kernel/llvm-release.sh | 4 |
10 files changed, 21 insertions, 21 deletions
diff --git a/tcwg_kernel-bisect.sh b/tcwg_kernel-bisect.sh index b198af00..bb29013d 100755 --- a/tcwg_kernel-bisect.sh +++ b/tcwg_kernel-bisect.sh @@ -230,7 +230,7 @@ if [ -f artifacts/first-bad ]; then cat > artifacts/ci_mail_parameters <<EOF CI_MAIL_RECIPIENTS=$CI_MAIL_RECIPIENTS -CI_MAIL_BODY="Bisected $current_project on $target @ $toolchain-${config[$toolchain]} @ linux-${config[linux]}-$linux_config between bad $bad_rev and baseline $baseline_rev . +CI_MAIL_BODY="Bisected $current_project on $target @ $toolchain-${rr[${toolchain}_version]} @ linux-${rr[linux_version]}-$linux_config between bad $bad_rev and baseline $baseline_rev . Bisect log: ${BUILD_URL}artifact/artifacts/bisect.log/*view*/ Artifacts: ${BUILD_URL}artifact/artifacts/ diff --git a/tcwg_kernel-build.sh b/tcwg_kernel-build.sh index 6691bf95..750e66fa 100755 --- a/tcwg_kernel-build.sh +++ b/tcwg_kernel-build.sh @@ -11,7 +11,7 @@ convert_args_to_variables "$@" mode="${mode-baseline}" # Toolchain to use: gnu or llvm -obligatory_variables config git_repo git_branch toolchain +obligatory_variables rr git_repo git_branch toolchain case "$mode" in "jenkins-full") @@ -40,14 +40,14 @@ if $verbose2; then set -x; fi trap "eval \"echo ERROR at \${FUNCNAME[0]}:\${BASH_LINENO[0]}\" > $top_artifacts/failures" EXIT if [ x"$target" = x"native" ]; then - config[target]=$(uname -m) + rr[target]=$(uname -m) else - config[target]=$target + rr[target]=$target fi # Baseline branch name for current configuration. These branches are # present in all above git repos. -baseline="linaro-local/ci/tcwg_kernel/$toolchain-${config[$toolchain]}-${config[target]}-${config[linux]}-$linux_config" +baseline="linaro-local/ci/tcwg_kernel/$toolchain-${rr[${toolchain}_version]}-${rr[target]}-${rr[linux_version]}-$linux_config" # We are not going to push any results for a one-off build. if [ x"$current_project" = x"none" ]; then diff --git a/tcwg_kernel/gnu-master.sh b/tcwg_kernel/gnu-master.sh index a1495018..77e05966 100644 --- a/tcwg_kernel/gnu-master.sh +++ b/tcwg_kernel/gnu-master.sh @@ -1,10 +1,10 @@ #!/bin/bash -declare -gA config +declare -gA rr declare -gA git_repo declare -gA git_branch -config[gnu]=master +rr[gnu_version]=master git_repo[binutils]=git://sourceware.org/git/binutils-gdb.git git_branch[binutils]=master git_repo[gcc]=git://gcc.gnu.org/git/gcc.git diff --git a/tcwg_kernel/gnu-release.sh b/tcwg_kernel/gnu-release.sh index f1a92d18..9379bcbe 100644 --- a/tcwg_kernel/gnu-release.sh +++ b/tcwg_kernel/gnu-release.sh @@ -1,10 +1,10 @@ #!/bin/bash -declare -gA config +declare -gA rr declare -gA git_repo declare -gA git_branch -config[gnu]=release +rr[gnu_version]=release git_repo[binutils]=git://sourceware.org/git/binutils-gdb.git git_branch[binutils]=binutils-2_31-branch git_repo[gcc]=git://gcc.gnu.org/git/gcc.git diff --git a/tcwg_kernel/linux-lts.sh b/tcwg_kernel/linux-lts.sh index 1fd4f84a..465c1e98 100644 --- a/tcwg_kernel/linux-lts.sh +++ b/tcwg_kernel/linux-lts.sh @@ -1,9 +1,9 @@ #!/bin/bash -declare -gA config +declare -gA rr declare -gA git_repo declare -gA git_branch -config[linux]=lts +rr[linux_version]=lts git_repo[linux]=git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git git_branch[linux]=linux-4.14.y diff --git a/tcwg_kernel/linux-mainline.sh b/tcwg_kernel/linux-mainline.sh index 3315e304..6fe6ca6c 100644 --- a/tcwg_kernel/linux-mainline.sh +++ b/tcwg_kernel/linux-mainline.sh @@ -1,9 +1,9 @@ #!/bin/bash -declare -gA config +declare -gA rr declare -gA git_repo declare -gA git_branch -config[linux]=mainline +rr[linux_version]=mainline git_repo[linux]=git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git git_branch[linux]=master diff --git a/tcwg_kernel/linux-next.sh b/tcwg_kernel/linux-next.sh index 9b645653..a87d83bc 100644 --- a/tcwg_kernel/linux-next.sh +++ b/tcwg_kernel/linux-next.sh @@ -1,9 +1,9 @@ #!/bin/bash -declare -gA config +declare -gA rr declare -gA git_repo declare -gA git_branch -config[linux]=next +rr[linux_version]=next git_repo[linux]=git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git git_branch[linux]=master diff --git a/tcwg_kernel/linux-stable.sh b/tcwg_kernel/linux-stable.sh index caf386dd..d6ca2647 100644 --- a/tcwg_kernel/linux-stable.sh +++ b/tcwg_kernel/linux-stable.sh @@ -1,9 +1,9 @@ #!/bin/bash -declare -gA config +declare -gA rr declare -gA git_repo declare -gA git_branch -config[linux]=stable +rr[linux_version]=stable git_repo[linux]=git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git git_branch[linux]=linux-4.18.y diff --git a/tcwg_kernel/llvm-master.sh b/tcwg_kernel/llvm-master.sh index edc22234..0daa911f 100644 --- a/tcwg_kernel/llvm-master.sh +++ b/tcwg_kernel/llvm-master.sh @@ -1,9 +1,9 @@ #!/bin/bash -declare -gA config +declare -gA rr declare -gA git_repo declare -gA git_branch -config[llvm]=master +rr[llvm_version]=master git_repo[llvm]=https://github.com/llvm-project/llvm-project-20170507.git git_branch[llvm]=master diff --git a/tcwg_kernel/llvm-release.sh b/tcwg_kernel/llvm-release.sh index 3df612b4..f632e978 100644 --- a/tcwg_kernel/llvm-release.sh +++ b/tcwg_kernel/llvm-release.sh @@ -1,9 +1,9 @@ #!/bin/bash -declare -gA config +declare -gA rr declare -gA git_repo declare -gA git_branch -config[llvm]=release +rr[llvm_version]=release git_repo[llvm]=https://github.com/llvm-project/llvm-project-20170507.git git_branch[llvm]=release_70 |