diff options
Diffstat (limited to 'libcxx/utils/docker')
| -rwxr-xr-x | libcxx/utils/docker/scripts/docker_start_buildbots.sh | 6 | ||||
| -rwxr-xr-x | libcxx/utils/docker/scripts/run_buildbot_new.sh | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/libcxx/utils/docker/scripts/docker_start_buildbots.sh b/libcxx/utils/docker/scripts/docker_start_buildbots.sh index f47ddcd2481..0531d6fa3b6 100755 --- a/libcxx/utils/docker/scripts/docker_start_buildbots.sh +++ b/libcxx/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/libcxx/utils/docker/scripts/run_buildbot_new.sh b/libcxx/utils/docker/scripts/run_buildbot_new.sh index 7030a5348d1..cb747a912ab 100755 --- a/libcxx/utils/docker/scripts/run_buildbot_new.sh +++ b/libcxx/utils/docker/scripts/run_buildbot_new.sh @@ -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 |
