tcwg-llvmbot: Experiment with Packet nodes and custom ninja

Change-Id: I8fcf8d17ca5f6f12a1a878943923df045aa2acb5

5 files changed, 15 insertions, 19 deletions

diff --git a/tcwg-base/tcwg-llvmbot/Dockerfile.in b/tcwg-base/tcwg-llvmbot/Dockerfile.in
index a1614b81..fbf44cd5 100644
--- a/tcwg-base/tcwg-llvmbot/Dockerfile.in
+++ b/tcwg-base/tcwg-llvmbot/Dockerfile.in
@@ -25,12 +25,12 @@ RUN cd ./llvm-config-buildslave/ \
 # When running with "-m 50" ninja will not start new jobs if system memory
 # utilization is beyond 50%.
 RUN apt-get remove -y ninja-build \
- && git clone -b stable https://github.com/maxim-kuvyrkov/ninja.git \
+ && git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
  && cd ninja \
  && ./configure.py --bootstrap && ./ninja all && ./ninja_test \
  && mv ninja /usr/local/bin/ninja.bin \
  && echo '#!/bin/sh' > /usr/local/bin/ninja \
- && echo '/usr/local/bin/ninja.bin -m 50 "$@"' >> /usr/local/bin/ninja \
+ && echo '/usr/local/bin/ninja.bin -m 75 -M 50 -D 1000  "$@"' >> /usr/local/bin/ninja \
  && chmod +x /usr/local/bin/ninja \
  && cd .. \
  && rm -rf ninja
diff --git a/tcwg-base/tcwg-llvmbot/build.sh b/tcwg-base/tcwg-llvmbot/build.sh
index bbc64ddd..7b03cb27 100755
--- a/tcwg-base/tcwg-llvmbot/build.sh
+++ b/tcwg-base/tcwg-llvmbot/build.sh
@@ -16,10 +16,7 @@ name=$(basename ${PWD} | cut -f3- -d '-')
 image=linaro/ci-${arch}-${name}-ubuntu:${distro}
 top=$(git rev-parse --show-toplevel)
 
-cat $top/tcwg-base/$name/start.sh.tmpl \
-    | sed -e "s#@IMAGE@#$image#g" \
-	  -e "s#@DISTRO@#$distro#g" > start.sh
-chmod +x start.sh
+cp $top/tcwg-base/$name/start.sh.tmpl start.sh
 cp $top/tcwg-base/$name/run.sh.tmpl run.sh
 
 # llvm-config repo is hosted on [secure] dev-private-git.l.o, so we
diff --git a/tcwg-base/tcwg-llvmbot/start.sh.tmpl b/tcwg-base/tcwg-llvmbot/start.sh.tmpl
index 0b80d8a5..c87f9057 100755
--- a/tcwg-base/tcwg-llvmbot/start.sh.tmpl
+++ b/tcwg-base/tcwg-llvmbot/start.sh.tmpl
@@ -2,9 +2,10 @@
 
 set -ex
 
-buildmaster="$1"
-slavename="$2"
-password="$3"
+image="$1"
+buildmaster="$2"
+slavename="$3"
+password="$4"
 
 usage ()
 {
@@ -24,8 +25,6 @@ else
     DOCKER="sudo docker"
 fi
 
-image=@IMAGE@
-
 case "$buildmaster" in
     "normal")
 	mastername="normal"
@@ -88,5 +87,5 @@ esac
 # seccomp:unconfined is required to disable ASLR for sanitizer tests.
 caps="--cap-add=IPC_LOCK --cap-add=SYS_PTRACE --security-opt seccomp:unconfined"
 
-$DOCKER pull $image
-$DOCKER run --name=$mastername-$slavename --hostname=$mastername-$slavename --restart=unless-stopped -dt -p 22 --memory=${memlimit}G --pids-limit=5000 $caps $image "$masterurl" "$slavename" "$password"
+#$DOCKER pull $image
+$DOCKER run --name=$mastername-$slavename --hostname=$mastername-$slavename --restart=unless-stopped -dt -p 22 --memory=${memlimit}G --pids-limit=5000 $caps "$image" "$masterurl" "$slavename" "$password"
diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile
index 486b69fc..a5f69b1a 100644
--- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile
+++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile
@@ -26,12 +26,12 @@ RUN cd ./llvm-config-buildslave/ \
 # When running with "-m 50" ninja will not start new jobs if system memory
 # utilization is beyond 50%.
 RUN apt-get remove -y ninja-build \
- && git clone -b stable https://github.com/maxim-kuvyrkov/ninja.git \
+ && git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
  && cd ninja \
  && ./configure.py --bootstrap && ./ninja all && ./ninja_test \
  && mv ninja /usr/local/bin/ninja.bin \
  && echo '#!/bin/sh' > /usr/local/bin/ninja \
- && echo '/usr/local/bin/ninja.bin -m 50 "$@"' >> /usr/local/bin/ninja \
+ && echo '/usr/local/bin/ninja.bin -m 75 -M 50 -D 1000  "$@"' >> /usr/local/bin/ninja \
  && chmod +x /usr/local/bin/ninja \
  && cd .. \
  && rm -rf ninja
@@ -43,4 +43,4 @@ COPY start.sh .
 
 ENTRYPOINT ["/run.sh"]
 CMD ["start.sh"]
-# checksum: eb1fb384433b013531ac30ed51dc2ff4
+# checksum: 1ff31bc261b5c027f3ac61637e12cc1b
diff --git a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/Dockerfile b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/Dockerfile
index b679e47e..8551610a 100644
--- a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/Dockerfile
+++ b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/Dockerfile
@@ -26,12 +26,12 @@ RUN cd ./llvm-config-buildslave/ \
 # When running with "-m 50" ninja will not start new jobs if system memory
 # utilization is beyond 50%.
 RUN apt-get remove -y ninja-build \
- && git clone -b stable https://github.com/maxim-kuvyrkov/ninja.git \
+ && git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
  && cd ninja \
  && ./configure.py --bootstrap && ./ninja all && ./ninja_test \
  && mv ninja /usr/local/bin/ninja.bin \
  && echo '#!/bin/sh' > /usr/local/bin/ninja \
- && echo '/usr/local/bin/ninja.bin -m 50 "$@"' >> /usr/local/bin/ninja \
+ && echo '/usr/local/bin/ninja.bin -m 75 -M 50 -D 1000  "$@"' >> /usr/local/bin/ninja \
  && chmod +x /usr/local/bin/ninja \
  && cd .. \
  && rm -rf ninja
@@ -43,4 +43,4 @@ COPY start.sh .
 
 ENTRYPOINT ["linux32", "/run.sh"]
 CMD ["start.sh"]
-# checksum: 0b94e4387b6895471280fe1232ffa912
+# checksum: f779c29e602be8231baef8a7b3a0dc6d