round-robin.sh: Delete push_baseline() step

... and merge functionality into update_baseline() step.
Defer "git push" of baseline branches to the CI job (aka .yaml
file), which prevents non-CI executions of tcwg_*-build.sh scripts
from affecting state of CI loops.

Change-Id: I2d0485c5283aa92d1aefdbb2cdc97786f1679377

4 files changed, 11 insertions, 31 deletions

diff --git a/round-robin.sh b/round-robin.sh
index 42737c70..ff88e180 100644
--- a/round-robin.sh
+++ b/round-robin.sh
@@ -851,21 +851,13 @@ BUILD_URL: ${BUILD_URL-$(pwd)}
 
 results:
 $(cat ${rr[top_artifacts]}/results)"
-    )
-}
-
-# Push to baseline branches and to base-artifacts repo.
-push_baseline ()
-{
-    (
-    set -euf -o pipefail
-
-    if [ x"${rr[update_baseline]}" = x"ignore" ]; then
-	return
-    fi
 
+    # Generate artifacts/jenkins/git-push.sh, which the CI job
+    # will use to update baseline branches in git repos.
     git_init_linaro_local_remote base-artifacts baseline false
-    git_push base-artifacts baseline ${rr[baseline_branch]}
+    cat > ${rr[top_artifacts]}/jenkins/git-push.sh <<EOF
+git -C base-artifacts push --force baseline HEAD:${rr[baseline_branch]}
+EOF
 
     local url
     local c
@@ -874,7 +866,10 @@ push_baseline ()
 	# the baseline repo.  This initializes read/write "baseline" remote.
 	url=$(print_baseline_repo "$c" false)
 	git_set_remote "$c" baseline "$url"
-	git_push $c baseline ${rr[baseline_branch]}
+	cat >> ${rr[top_artifacts]}/jenkins/git-push.sh <<EOF
+git -C $c push --force baseline HEAD:${rr[baseline_branch]}
+EOF
     done
+    chmod +x ${rr[top_artifacts]}/jenkins/git-push.sh
     )
 }
diff --git a/tcwg_bmk-build.sh b/tcwg_bmk-build.sh
index b9e73cb2..416eb9c5 100755
--- a/tcwg_bmk-build.sh
+++ b/tcwg_bmk-build.sh
@@ -137,9 +137,6 @@ trap print_traceback EXIT
 default_start_at=""
 default_finish_at=""
 case "${rr[mode]}" in
-    "baseline")
-	default_finish_at="update_baseline"
-	;;
     "bisect")
 	single_updated_component="$(print_single_updated_component)"
 	case $single_updated_component in
@@ -149,12 +146,11 @@ case "${rr[mode]}" in
 	    llvm) default_start_at="build_llvm-true" ;;
 	    newlib) default_start_at="build_abe-newlib" ;;
 	    *) assert_with_msg \
-        "Invalid single updated component \"$single_updated_component\"" false
-      ;;
+		   "Invalid single updated component \"$single_updated_component\"" false
+	       ;;
 	esac
 	default_finish_at="check_regression"
 	;;
-    "jenkins-full") ;;
 esac
 if [ x"$start_at" = x"default" ]; then
     start_at="$default_start_at"
@@ -954,6 +950,5 @@ case "${#cflags[@]}" in
 	;;
 esac
 run_step stop_on_fail x update_baseline
-run_step stop_on_fail x push_baseline
 
 trap "" EXIT
diff --git a/tcwg_gnu-build.sh b/tcwg_gnu-build.sh
index 5ef04e0f..3d16975e 100755
--- a/tcwg_gnu-build.sh
+++ b/tcwg_gnu-build.sh
@@ -79,9 +79,6 @@ trap print_traceback EXIT
 default_start_at=""
 default_finish_at=""
 case "${rr[mode]}" in
-    "baseline")
-	default_finish_at="update_baseline"
-	;;
     "bisect")
 	case "$(print_single_updated_component):${rr[ci_project]}" in
 	    binutils:*) default_start_at="build_abe-binutils" ;;
@@ -96,7 +93,6 @@ case "${rr[mode]}" in
 	esac
 	default_finish_at="check_regression"
 	;;
-    "jenkins-full") ;;
 esac
 if [ x"$start_at" = x"default" ]; then
     start_at="$default_start_at"
@@ -306,6 +302,5 @@ case "${rr[ci_project]}" in
 esac
 run_step reset_on_fail x check_regression
 run_step stop_on_fail x update_baseline
-run_step stop_on_fail x push_baseline
 
 trap "" EXIT
diff --git a/tcwg_kernel-build.sh b/tcwg_kernel-build.sh
index c8c7ac47..40f789d5 100755
--- a/tcwg_kernel-build.sh
+++ b/tcwg_kernel-build.sh
@@ -58,9 +58,6 @@ trap print_traceback EXIT
 default_start_at=""
 default_finish_at=""
 case "${rr[mode]}" in
-    "baseline")
-	default_finish_at="update_baseline"
-	;;
     "bisect")
 	case "$(print_single_updated_component)" in
 	    binutils) default_start_at="build_abe-binutils" ;;
@@ -72,7 +69,6 @@ case "${rr[mode]}" in
 	esac
 	default_finish_at="check_regression"
 	;;
-    "jenkins-full") ;;
 esac
 if [ x"$start_at" = x"default" ]; then
     start_at="$default_start_at"
@@ -328,6 +324,5 @@ run_step skip_on_fail x build_linux
 run_step skip_on_fail x boot_linux
 run_step reset_on_fail x check_regression
 run_step stop_on_fail x update_baseline
-run_step stop_on_fail x push_baseline
 
 trap "" EXIT