tcwg-buildfarm-master-cambridge-01: Build and test the toolchain in the same job.

And inherit from the original environment.

Change-Id: I9ea914f789a8268140da30c517ffd3db61dd3de8

1 files changed, 24 insertions, 25 deletions

diff --git a/tcwg-buildfarm-master-cambridge-01.yaml b/tcwg-buildfarm-master-cambridge-01.yaml
index 41d98a4803..3de3e220ac 100644
--- a/tcwg-buildfarm-master-cambridge-01.yaml
+++ b/tcwg-buildfarm-master-cambridge-01.yaml
@@ -154,31 +154,30 @@
             result=0
             case $target in
             aarch64-linux-gnu)
-              # Since we are cross-testing, split the validation into
-              # 2 phases: build + check, where check is performed by
-              # another jenkins job, which reserves the tester machine
-              # and connect back to the builder to cross-execute the
-              # tests.
-              ${BUILD_SHELL} -x ./jenkins.sh --target ${target} --gcc-branch ${gcc_branch} --languages ${languages} $bootstrap --fileserver ex40-01.tcwglab.linaro.org/snapshots-ref --logserver $log_server $logname_opt $norebuild || result="$?"
-              if [ $result -eq 0 -a "x$runtests_opt" != "x" ]; then
-                echo "#!/bin/sh" > cross_check_script_$target
-                echo "cd `pwd`" >> cross_check_script_$target
-                echo "echo Running on: ; hostname -f" >> cross_check_script_$target
-                echo "echo Tester: \$1" >> cross_check_script_$target
-                echo "sed -i config/boards/infra-tcwglab-armv8.exp -e \"s/set_board_info hostname .*/set_board_info hostname \$1/\"" >> cross_check_script_$target
-                echo "cat config/boards/infra-tcwglab-armv8.exp" >> cross_check_script_$target
-                # Command to execute the tests; it should not need to
-                # rebuild anything.
-                echo "ulimit -u 5000" >> cross_check_script_$target
-                echo "session_id=\$(schroot -b -c chroot:$schroot_image --preserve-environment)" >> cross_check_script_$target
-                echo BUILD_SHELL=\"schroot -r -c session:\$session_id --preserve-environment -- bash\" >> cross_check_script_$target
-                echo '${BUILD_SHELL} -c "echo \"Build session is up; ulimit config:\"; ulimit -a"' >> cross_check_script_$target
-                echo '${BUILD_SHELL}' -x ./jenkins.sh --target ${target} --gcc-branch ${gcc_branch} --languages ${languages} $bootstrap $runtests_opt --excludecheck ${excludecheck} --fileserver ex40-01.tcwglab.linaro.org/snapshots-ref --logserver $log_server $logname_opt $norebuild >> cross_check_script_$target
-                cat cross_check_script_$target
-                echo "cross_check_script_path=`pwd`/cross_check_script_$target" >> cross_check_parameters_$target
-                echo "builder=`hostname -f` " >> cross_check_parameters_$target
-                cat cross_check_parameters_$target
-              fi
+              # Since we are cross-testing, prepare environment for
+              # another Jenkins jobs which will be launched on the
+              # tester machine. It will remotely start the build+check
+              # on the builder machine.
+              echo "#!/bin/sh" > cross_check_script_$target
+              echo "cd `pwd`" >> cross_check_script_$target
+              echo "echo Running on: ; hostname -f" >> cross_check_script_$target
+              echo "echo Tester: \$1" >> cross_check_script_$target
+              echo "sed -i config/boards/infra-tcwglab-armv8.exp -e \"s/set_board_info hostname .*/set_board_info hostname \$1/\"" >> cross_check_script_$target
+              echo "cat config/boards/infra-tcwglab-armv8.exp" >> cross_check_script_$target
+              # Command to build the toolchain and execute the tests, using the original env variables.
+              echo "ulimit -u 5000" >> cross_check_script_$target
+              echo "export WORKSPACE=$WORKSPACE" >> cross_check_script_$target
+              echo "export node_selector=$node_selector" >> cross_check_script_$target
+              echo "export JOB_NAME=$JOB_NAME" >> cross_check_script_$target
+              echo "export NODE_NAME=$NODE_NAME" >> cross_check_script_$target
+              echo "session_id=\$(schroot -b -c chroot:$schroot_image --preserve-environment)" >> cross_check_script_$target
+              echo BUILD_SHELL=\"schroot -r -c session:\$session_id --preserve-environment -- bash\" >> cross_check_script_$target
+              echo '${BUILD_SHELL} -c "echo \"Build session is up; ulimit config:\"; ulimit -a"' >> cross_check_script_$target
+              echo '${BUILD_SHELL}' -x ./jenkins.sh --target ${target} --gcc-branch ${gcc_branch} --languages ${languages} $bootstrap $runtests_opt --excludecheck ${excludecheck} --fileserver ex40-01.tcwglab.linaro.org/snapshots-ref --logserver $log_server $logname_opt $norebuild >> cross_check_script_$target
+              cat cross_check_script_$target
+              echo "cross_check_script_path=`pwd`/cross_check_script_$target" >> cross_check_parameters_$target
+              echo "builder=`hostname -f` " >> cross_check_parameters_$target
+              cat cross_check_parameters_$target
               ;;
             *)
               ${BUILD_SHELL} -x ./jenkins.sh --target ${target} --gcc-branch ${gcc_branch} --languages ${languages} $bootstrap $runtests_opt --excludecheck ${excludecheck} --fileserver ex40-01.tcwglab.linaro.org/snapshots-ref --logserver $log_server $logname_opt $norebuild || result="$?"