From 290a3a364888c26999e61ddd3247725ef81b6686 Mon Sep 17 00:00:00 2001
From: Eric Fiselier <eric@efcs.ca>
Date: Sun, 28 Apr 2019 16:42:49 +0000
Subject: [PATCH] attempt to unbreak build bots

llvm-svn: 359404
---
 libcxx/utils/docker/debian9/Dockerfile          | 5 +++--
 libcxx/utils/docker/scripts/run_buildbot_new.sh | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/libcxx/utils/docker/debian9/Dockerfile b/libcxx/utils/docker/debian9/Dockerfile
index 1dfeb06..4530a70 100644
--- a/libcxx/utils/docker/debian9/Dockerfile
+++ b/libcxx/utils/docker/debian9/Dockerfile
@@ -36,8 +36,10 @@ RUN apt-get update && \
       software-properties-common \
       gnupg \
       apt-transport-https \
+      sudo \
       systemd \
-      sysvinit-utils && \
+      sysvinit-utils \
+      systemd-sysv && \
   update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.gold" 20 && \
   update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.bfd" 10 && \
   rm -rf /var/lib/apt/lists/*
@@ -166,7 +168,6 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends \
     bash-completion \
     vim \
-    systemd-sysv \
     buildbot-slave \
   && rm -rf /var/lib/apt/lists/*
 
diff --git a/libcxx/utils/docker/scripts/run_buildbot_new.sh b/libcxx/utils/docker/scripts/run_buildbot_new.sh
index 3f21b90..92ec2ab 100755
--- a/libcxx/utils/docker/scripts/run_buildbot_new.sh
+++ b/libcxx/utils/docker/scripts/run_buildbot_new.sh
@@ -15,6 +15,8 @@ popd
 apt-get update -y
 apt-get upgrade -y
 
+apt-get install sudo -y
+
 # FIXME(EricWF): Remove this hack. It's only in place to temporarily fix linking libclang_rt from the
 # debian packages.
 # WARNING: If you're not a buildbot, DO NOT RUN!
@@ -67,7 +69,7 @@ function try_start_builder {
   local BOT_DIR=$BOT_ROOT/b$N
   local BOT_NAME=$BOT_ROOT_NAME$N
   setup_numbered_bot $BOT_NAME $BOT_DIR
-  /usr/bin/buildslave start $BOT_DIR
+  sudo -u buildbot /usr/bin/buildslave start $BOT_DIR
 
   sleep 30
   cat /tmp/twistd.log
@@ -82,8 +84,7 @@ function try_start_builder {
   exit 1
 }
 
-
-for N in 1 2 3 4 5
+for N in `shuf -i 1-5`
 do
   if try_start_builder $N; then
     break
-- 
2.7.4