tcwg_gnu-build.sh: Update settings per ci_project

Change-Id: I8a237496bb21a756c198511ad68096655b479667

1 files changed, 39 insertions, 29 deletions

diff --git a/tcwg_gnu-build.sh b/tcwg_gnu-build.sh
index 421f06e5..1f8b2ef7 100755
--- a/tcwg_gnu-build.sh
+++ b/tcwg_gnu-build.sh
@@ -10,7 +10,7 @@ scripts=$(dirname $0)
 
 convert_args_to_variables "$@"
 
-obligatory_variables rr[ci_config]
+obligatory_variables rr[ci_project] rr[ci_config]
 declare -A rr
 
 # Execution mode: baseline, bisect, jenkins-full
@@ -18,7 +18,6 @@ rr[mode]="${rr[mode]-baseline}"
 
 # Set custom revision for one of the projects, and use baseline revisions
 # for all other projects.
-rr[ci_project]="${rr[ci_project]-tcwg_gnu}"
 rr[baseline_branch]="${rr[baseline_branch]-linaro-local/ci/${rr[ci_project]}/${rr[ci_config]}}"
 rr[update_baseline]="${rr[update_baseline]-update}"
 rr[top_artifacts]="${rr[top_artifacts]-$(pwd)/artifacts}"
@@ -28,30 +27,30 @@ rr[top_artifacts]="${rr[top_artifacts]-$(pwd)/artifacts}"
 # location
 rr[top_artifacts]=$(abs_path "${rr[top_artifacts]}")
 
-# {toolchain_name}-{toolchain_ver}-{target}-{type_of_test}
-IFS=- read -a ci_config <<EOF
+# {toolchain_ver}-{target}[-{type_of_test}]
+IFS=- read -a ci_project_config <<EOF
 ${rr[ci_config]}
 EOF
 # Toolchain version -- master or release
-toolchain_ver=${toolchain_ver-${ci_config[1]}}
-# type_of_test contains the type of action to perform in this test
-# campaign: bootstrap, bootstrap_lto, check_binutils, ....
-type_of_test=${type_of_test-${ci_config[3]}}
+toolchain_ver=${toolchain_ver-${ci_config[0]}}
+# optional type_of_test contains the type of action to perform in this test
+# campaign: bootstrap, bootstrap_lto, ...
+type_of_test=${type_of_test-${ci_config[2]-}}
 
-case "$type_of_test" in
-    *_binutils)
+case "${rr[ci_project]}" in
+    tcwg_gnu_native_*)
 	rr[target]="${rr[target]-native}"
-	rr[components]="binutils"
+	rr[components]="${rr[components]-binutils}"
 	;;
-    *bootstrap*|*gcc*)
+    tcwg_gcc_*)
 	rr[target]="${rr[target]-native}"
-	rr[components]="binutils gcc"
+	rr[components]="${rr[components]-binutils gcc}"
 	;;
-    *_cross)
-	rr[target]="${rr[target]-${ci_config[2]}}"
-	rr[components]="binutils gcc glibc qemu"
+    tcwg_gnu_cross_*)
+	rr[target]="${rr[target]-${ci_config[1]}}"
+	rr[components]="${rr[components]-binutils gcc glibc qemu}"
 	;;
-    *) assert_with_msg "Unknown type_of_test: $type_of_test" false ;;
+    *) assert_with_msg "Unknown ci_project: ${rr[ci_project]}" false ;;
 esac
 
 runtestflags=()
@@ -84,10 +83,11 @@ case "${rr[mode]}" in
 	default_finish_at="update_baseline"
 	;;
     "bisect")
-	case "$(print_single_updated_component):$type_of_test" in
+	case "$(print_single_updated_component):${rr[ci_project]}" in
 	    binutils:*) default_start_at="build_abe-binutils" ;;
-	    gcc:*_cross) default_start_at="build_abe-stage1" ;;
-	    gcc:*) default_start_at="build_abe-${type_of_test#check_}" ;;
+	    gcc:tcwg_gnu_cross_*) default_start_at="build_abe-stage1" ;;
+	    gcc:tcwg_gcc_check) default_start_at="build_abe-gcc" ;;
+	    gcc:tcwg_gcc_*bootstrap) default_start_at="build_abe-${type_of_test#check_}" ;;
 	    glibc:*) default_start_at="build_abe-glibc" ;;
 	    qemu:*) default_start_at="build_abe-qemu" ;;
 	    *) assert_with_msg "Trying to bisecting unknown component: $(print_single_updated_component)" false ;;
@@ -194,8 +194,8 @@ no_regression_p ()
 
 run_step stop_on_fail -10 reset_artifacts
 run_step stop_on_fail x prepare_abe
-case "$type_of_test" in
-    build_cross)
+case "${rr[ci_project]}" in
+    tcwg_gnu_cross_build)
 	run_step skip_on_fail 0 true
 	run_step skip_on_fail 1 build_abe binutils
 	run_step skip_on_fail 2 build_abe stage1
@@ -204,7 +204,7 @@ case "$type_of_test" in
 	run_step skip_on_fail 5 build_abe stage2
 	run_step skip_on_fail 6 build_abe qemu
 	;;
-    check_cross)
+    tcwg_gnu_cross_check_gcc)
 	run_step skip_on_fail -8 build_abe binutils
 	run_step skip_on_fail -7 build_abe stage1
 	run_step skip_on_fail -6 build_abe linux
@@ -214,21 +214,31 @@ case "$type_of_test" in
 	run_step skip_on_fail 0 build_abe dejagnu
 	run_step skip_on_fail 1 build_abe check_gcc -- "${runtestflags[@]}"
 	;;
-    check_binutils)
+    tcwg_gnu_native_build)
+	run_step skip_on_fail 0 true
+	run_step skip_on_fail 1 build_abe binutils
+	;;
+    tcwg_gnu_native_check_binutils)
 	run_step skip_on_fail -2 build_abe binutils
 	run_step skip_on_fail 0 build_abe dejagnu
 	run_step skip_on_fail 1 build_abe check_binutils -- "${runtestflags[@]}"
 	;;
-    check_gcc*|check_bootstrap*)
+    tcwg_gcc_bootstrap)
+	run_step skip_on_fail 0 true
+	run_step skip_on_fail 1 build_abe ${type_of_test}
+	;;
+    tcwg_gcc_check)
+	run_step skip_on_fail -2 build_abe binutils
+	run_step skip_on_fail -1 build_abe gcc
+	run_step skip_on_fail 0 build_abe dejagnu
+	run_step skip_on_fail 1 build_abe check_gcc -- "${runtestflags[@]}"
+	;;
+    tcwg_gcc_check_bootstrap)
 	run_step skip_on_fail -2 build_abe binutils
 	run_step skip_on_fail -1 build_abe ${type_of_test#check_}
 	run_step skip_on_fail 0 build_abe dejagnu
 	run_step skip_on_fail 1 build_abe ${type_of_test} -- "${runtestflags[@]}"
 	;;
-    *)
-	run_step skip_on_fail 0 true
-	run_step skip_on_fail 1 build_abe ${type_of_test}
-	;;
 esac
 run_step reset_on_fail x check_regression
 run_step stop_on_fail x update_baseline