[libcxx-commits] [libcxx] r363442 - attempt to unbreak buildbots

[Eric Fiselier via libcxx-commits]

Author: ericwf
Date: Fri Jun 14 12:31:17 2019
New Revision: 363442

URL: http://llvm.org/viewvc/llvm-project?rev=363442&view=rev
Log:
attempt to unbreak buildbots

Modified:
    libcxx/trunk/utils/docker/scripts/docker_start_buildbots.sh
    libcxx/trunk/utils/docker/scripts/run_buildbot_new.sh

Modified: libcxx/trunk/utils/docker/scripts/docker_start_buildbots.sh
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/utils/docker/scripts/docker_start_buildbots.sh?rev=363442&r1=363441&r2=363442&view=diff
==============================================================================
--- libcxx/trunk/utils/docker/scripts/docker_start_buildbots.sh (original)
+++ libcxx/trunk/utils/docker/scripts/docker_start_buildbots.sh Fri Jun 14 12:31:17 2019
@@ -1,8 +1,12 @@
 #!/usr/bin/env bash
 set -x
 
+if [[ "$1" == "--new" ]]; then
+  shift
+fi
+
 # Update the libc++ sources in the image in order to use the most recent version of
 # run_buildbots.sh
 cd /libcxx
 git pull
-/libcxx/utils/docker/scripts/run_buildbot.sh "$@"
+/libcxx/utils/docker/scripts/run_buildbot_new.sh "$@"

Modified: libcxx/trunk/utils/docker/scripts/run_buildbot_new.sh
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/utils/docker/scripts/run_buildbot_new.sh?rev=363442&r1=363441&r2=363442&view=diff
==============================================================================
--- libcxx/trunk/utils/docker/scripts/run_buildbot_new.sh (original)
+++ libcxx/trunk/utils/docker/scripts/run_buildbot_new.sh Fri Jun 14 12:31:17 2019
@@ -73,10 +73,13 @@ function try_start_builder {
   sudo -u buildbot /usr/bin/buildslave start $BOT_DIR
 
   sleep 30
-  cat /tmp/twistd.log
+  cat $BOT_DIR/twistd.log
   if grep --quiet "slave is ready" $BOT_DIR/twistd.log; then
     return 0
   fi
+  if grep --quiet "configuration update complete" $BOT_DIR/twistd.log; then
+    return 0
+  fi
   if grep "rejecting duplicate slave" $BOT_DIR/twistd.log; then
     return 1
   fi