attempt to unbreak buildbots
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@363442 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/utils/docker/scripts/docker_start_buildbots.sh b/utils/docker/scripts/docker_start_buildbots.sh
index f47ddcd..0531d6f 100755
--- a/utils/docker/scripts/docker_start_buildbots.sh
+++ b/utils/docker/scripts/docker_start_buildbots.sh
@@ -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 "$@"
diff --git a/utils/docker/scripts/run_buildbot_new.sh b/utils/docker/scripts/run_buildbot_new.sh
index 7030a53..cb747a9 100755
--- a/utils/docker/scripts/run_buildbot_new.sh
+++ b/utils/docker/scripts/run_buildbot_new.sh
@@ -73,10 +73,13 @@
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
