summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPrathamesh Kulkarni <prathamesh.kulkarni@linaro.org>2019-02-14 19:59:01 +0530
committerPrathamesh Kulkarni <prathamesh.kulkarni@linaro.org>2019-02-14 19:59:01 +0530
commit0caca1c2cf90714ae1cb4e23558ce9194caf2533 (patch)
treed3751ff8737fc146ef326730538d7c28da8d1fa0
parentb5025b41af714ed4dc014905d7511362d2138a90 (diff)
parent21cb97b04552ac9e8a26392f811e24ab23e937eb (diff)
Merge branch 'master' into tcwg_gnu
Change-Id: I09d0c3f480b350eb8c1a9a51c13635bb191ce37f
-rw-r--r--jenkins-helpers.sh1
-rwxr-xr-xtcwg-update-llvmbot-containers.sh2
2 files changed, 2 insertions, 1 deletions
diff --git a/jenkins-helpers.sh b/jenkins-helpers.sh
index 5a471800..8a66b2a9 100644
--- a/jenkins-helpers.sh
+++ b/jenkins-helpers.sh
@@ -1135,6 +1135,7 @@ run_step ()
if ! $skip; then
echo "RUNNING ${step[@]}; see tail -f $run_step_artifacts/console.log"
+ run_step_status=0
eval "if $run_step_verbose; then set -x; else set +x; fi; ${step[@]}" 2>&1 | tee -a $run_step_top_artifacts/console.log > $run_step_artifacts/console.log &
wait $! || run_step_status=$?
diff --git a/tcwg-update-llvmbot-containers.sh b/tcwg-update-llvmbot-containers.sh
index 921c00dd..6fc05781 100755
--- a/tcwg-update-llvmbot-containers.sh
+++ b/tcwg-update-llvmbot-containers.sh
@@ -35,7 +35,7 @@ case "$NODE_NAME" in
arm-quick
arm-selfhost-neon
)
- masters=(normal silent)
+ masters=(normal)
;;
tcwg-llvmbot-tk1-*)
bot_prefix=""