Merge remote-tracking branch 'origin/tcwg-tested' into tcwg-stagingtcwg-staging

Change-Id: I8f713bde4c167f71919bdbd8b2b8e2513ac5ed19

47 files changed, 220 insertions, 296 deletions

diff --git a/README b/README
index e43ded4f..ba2119c5 100644
--- a/README
+++ b/README
@@ -24,6 +24,23 @@ describes the image. For instance
 xenial-arm64-tcwg-base/xenial-arm64-tcwg-build, and run ./build.sh
 from there to rebuild the xenial-arm64-tcwg-build image.
 
+TCWG's Dockerfiles in DISTRO-ARCH-tcwg-base/* directories are generated
+from Dockerfile.in templates in respective tcwg-base/* directories.  Run
+tcwg-base/generate-dockerfiles.sh (without parameters) whenever you
+change any of Dockerfile.in templates -- this will update all affected
+Dockerfiles.
+
+Once Dockerfiles are regenerated, you should test your change locally
+by building the image.  For this go to image's directory and run
+"./build.sh".  "./build.sh" script uses name of current directory to
+determine distro version and other parameters, so it's important
+to run "./build.sh" from its own directory.
+
+Note that "./build.sh" will first re-build all images that current image
+is derived from.  E.g., *-tcwg-dev image will first re-build respective
+*-tcwg-base image -- this can take a lot of time for the first run,
+but, once cache is populated, re-builds are very quick.
+
 Maintainer(s)
 -------------
 
diff --git a/bionic-amd64-tcwg-base/Dockerfile b/bionic-amd64-tcwg-base/Dockerfile
index 4415e4dc..1e639a57 100644
--- a/bionic-amd64-tcwg-base/Dockerfile
+++ b/bionic-amd64-tcwg-base/Dockerfile
@@ -1,10 +1,12 @@
 # Auto generated from tcwg-base/Dockerfile.in. Do not edit.
 FROM ubuntu:bionic
 
-# Unminimize Ubuntu Bionic to install contrib files of git
-RUN echo y | unminimize \
+# Unminimize Ubuntu Bionic to install contrib files of git (after package
+# update, otherwise unminimize's "apt upgrade" might fail).
+RUN true \
  && apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y \
+ && echo y | unminimize \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y devscripts \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
  alien \
@@ -46,12 +48,14 @@ RUN echo y | unminimize \
  libmpc-dev \
  libmpfr-dev \
  libncurses5-dev \
+ libpixman-1-dev \
  libpython2.7-dev \
  libreadline-dev \
  libssl-dev \
  libtcnative-1 \
  libtool \
  linux-tools-generic \
+ linux-tools-4.18.0-13-generic \
  lzop \
  make \
  mingw-w64 \
@@ -76,6 +80,7 @@ RUN echo y | unminimize \
  texlive-fonts-recommended \
  texlive-latex-recommended \
  time \
+ unifdef \
  valgrind \
  vim \
  virtualenv \
@@ -114,7 +119,15 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
  && cd .. \
  && rm -rf ninja
 
-# QEMU 2.8 doesn't build cleanly with Ubuntu Bionic's gcc.
+RUN mkdir /tmp/docker-install-qemu.$$ \
+ && cd /tmp/docker-install-qemu.$$ \
+ && qemu_ver=3.1.0 && wget --progress=dot:giga http://download.qemu-project.org/qemu-${qemu_ver}.tar.xz \
+ && tar xf qemu-${qemu_ver}.tar.xz \
+ && mkdir build && cd build \
+ && ../qemu-${qemu_ver}/configure --prefix=/usr/local --target-list=armeb-linux-user \
+ && make all install -j $(nproc --all) \
+ && cd && rm -rf /tmp/docker-install-qemu.$$
+
 
 COPY home-data/ /home-data/
 COPY new-user.sh /usr/local/bin/
@@ -133,4 +146,4 @@ VOLUME /tmp
 
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
-# checksum: 8127518c31a4a5ba7b356416d94cfdff
+# checksum: af1326e7c8496d13d3b9983562697055
diff --git a/bionic-amd64-tcwg-base/bionic-amd64-tcwg-build/Dockerfile b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-build/Dockerfile
new file mode 100644
index 00000000..2805cc4b
--- /dev/null
+++ b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-build/Dockerfile
@@ -0,0 +1,24 @@
+# Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit.
+FROM linaro/ci-amd64-tcwg-base-ubuntu:bionic
+
+RUN while read line; do \
+      if [ x"$(echo "$line" | cut -d: -f 4)" != x"9000" ]; then \
+        continue; \
+      fi; \
+      new-user.sh --passwd "$line"; \
+      user=$(echo "$line" | cut -d: -f 1); \
+      sudo -i -u $user ccache --print-config; \
+    done </home-data/passwd
+
+# Install wine.  On amd64 arch we need to enable i386, otherwise wine
+# won't meet dependencies (this is the case at least for trusty and xenial).
+RUN \
+ apt-get update \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+ wine-stable \
+ && apt-get clean \
+ && rm -rf \
+ /var/lib/apt/lists/* \
+ /tmp/* \
+ /var/tmp/*
+# checksum: edf5a5242fe46cab578b914fe031b6d0
diff --git a/bionic-amd64-tcwg-base/bionic-amd64-tcwg-build/build.sh b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-build/build.sh
new file mode 120000
index 00000000..50162e02
--- /dev/null
+++ b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-build/build.sh
@@ -0,0 +1 @@
+../../tcwg-base/tcwg-build/build.sh
\ No newline at end of file
diff --git a/bionic-amd64-tcwg-base/bionic-amd64-tcwg-build/gerrit-branches b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-build/gerrit-branches
new file mode 120000
index 00000000..628350a5
--- /dev/null
+++ b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-build/gerrit-branches
@@ -0,0 +1 @@
+../../tcwg-base/tcwg-build/gerrit-branches
\ No newline at end of file
diff --git a/bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/Dockerfile b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/Dockerfile
index dc089b98..bc19c8c3 100644
--- a/bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/Dockerfile
+++ b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/Dockerfile
@@ -3,15 +3,6 @@ FROM linaro/ci-amd64-tcwg-base-ubuntu:bionic
 
 RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y \
- software-properties-common \
- && apt-get clean \
- && rm -rf \
- /var/lib/apt/lists/* \
- /tmp/* \
- /var/tmp/*
-
-RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y \
  apt-file \
  git-gui \
  git-svn \
@@ -20,9 +11,9 @@ RUN apt-get update \
  locales \
  mc \
  screen \
+ software-properties-common \
  stgit \
  tmux \
- unifdef \
  && apt-get clean \
  && rm -rf \
  /var/lib/apt/lists/* \
@@ -40,4 +31,4 @@ COPY run.sh start.sh /
 
 ENTRYPOINT ["/run.sh"]
 CMD ["start.sh"]
-# checksum: b9ac1e71aeec6ee361f7fadb2f0a36a5
+# checksum: e0acd069d02b7a2424ac723f3a7bf358
diff --git a/bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/bionic-amd64-tcwg-x2go/Dockerfile b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/bionic-amd64-tcwg-x2go/Dockerfile
index 6691e70a..631ee616 100644
--- a/bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/bionic-amd64-tcwg-x2go/Dockerfile
+++ b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/bionic-amd64-tcwg-x2go/Dockerfile
@@ -12,8 +12,7 @@ RUN apt-get update \
  /tmp/* \
  /var/tmp/*
 
-RUN true \
- && apt-get update \
+RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y \
  duplicity \
  mate-desktop-environment \
@@ -33,4 +32,4 @@ RUN apt-get update \
  /var/lib/apt/lists/* \
  /tmp/* \
  /var/tmp/*
-# checksum: 6cae4c37eaa031fb02326a6ebda501f6
+# checksum: a30214ab5fb77eefe535dc3b2edc9d44
diff --git a/bionic-arm64-tcwg-base/Dockerfile b/bionic-arm64-tcwg-base/Dockerfile
index ae59bd3a..3c995343 100644
--- a/bionic-arm64-tcwg-base/Dockerfile
+++ b/bionic-arm64-tcwg-base/Dockerfile
@@ -1,10 +1,12 @@
 # Auto generated from tcwg-base/Dockerfile.in. Do not edit.
 FROM ubuntu:bionic
 
-# Unminimize Ubuntu Bionic to install contrib files of git
-RUN echo y | unminimize \
+# Unminimize Ubuntu Bionic to install contrib files of git (after package
+# update, otherwise unminimize's "apt upgrade" might fail).
+RUN true \
  && apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y \
+ && echo y | unminimize \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y devscripts \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
  alien \
@@ -49,6 +51,7 @@ RUN echo y | unminimize \
  libtcnative-1 \
  libtool \
  linux-tools-generic \
+ linux-tools-4.18.0-13-generic \
  lzop \
  make \
  net-tools \
@@ -71,6 +74,7 @@ RUN echo y | unminimize \
  texlive-fonts-recommended \
  texlive-latex-recommended \
  time \
+ unifdef \
  valgrind \
  vim \
  virtualenv \
@@ -109,7 +113,6 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
  && cd .. \
  && rm -rf ninja
 
-# QEMU 2.8 doesn't build cleanly with Ubuntu Bionic's gcc.
 
 COPY home-data/ /home-data/
 COPY new-user.sh /usr/local/bin/
@@ -128,4 +131,4 @@ VOLUME /tmp
 
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
-# checksum: 94b7dcd8368a0647ea0f057275d1e7e0
+# checksum: 50a99c601dd50c455613a9aa28c5c136
diff --git a/bionic-arm64-tcwg-base/bionic-arm64-tcwg-dev/Dockerfile b/bionic-arm64-tcwg-base/bionic-arm64-tcwg-dev/Dockerfile
index a1b1a775..78fde257 100644
--- a/bionic-arm64-tcwg-base/bionic-arm64-tcwg-dev/Dockerfile
+++ b/bionic-arm64-tcwg-base/bionic-arm64-tcwg-dev/Dockerfile
@@ -3,15 +3,6 @@ FROM linaro/ci-arm64-tcwg-base-ubuntu:bionic
 
 RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y \
- software-properties-common \
- && apt-get clean \
- && rm -rf \
- /var/lib/apt/lists/* \
- /tmp/* \
- /var/tmp/*
-
-RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y \
  apt-file \
  git-gui \
  git-svn \
@@ -20,9 +11,9 @@ RUN apt-get update \
  locales \
  mc \
  screen \
+ software-properties-common \
  stgit \
  tmux \
- unifdef \
  && apt-get clean \
  && rm -rf \
  /var/lib/apt/lists/* \
@@ -40,4 +31,4 @@ COPY run.sh start.sh /
 
 ENTRYPOINT ["/run.sh"]
 CMD ["start.sh"]
-# checksum: 87fed31a1bc944d57b22d9424255465b
+# checksum: e1d4f2e78ee4ff7ae86f1e22953e476d
diff --git a/ci-amd64-llp-alpine/test_run.sh b/ci-amd64-llp-alpine/test_run.sh
new file mode 100755
index 00000000..fd2767d7
--- /dev/null
+++ b/ci-amd64-llp-alpine/test_run.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+REPO=/tmp/test-llp-root
+
+mkdir -p $REPO/test-llp.linaro.org
+test \! -d $REPO/linaro-license-protection && (cd $REPO; git clone https://git.linaro.org/infrastructure/linaro-license-protection.git)
+
+docker run --name test-llp --rm -p 8080:8080 -v $REPO/test-llp.linaro.org:/srv -v $REPO/linaro-license-protection:/srv/linaro-license-protection linaro/ci-amd64-llp-alpine
diff --git a/jessie-amd64-jenkins-master/Dockerfile b/jessie-amd64-jenkins-master/Dockerfile
index a1c36712..84a52d2c 100644
--- a/jessie-amd64-jenkins-master/Dockerfile
+++ b/jessie-amd64-jenkins-master/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/jenkins:2.150
+FROM jenkins/jenkins:2.150.2
 
 ENV JENKINS_JAVA_PARAMETERS="-server -XX:+AlwaysPreTouch -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/jenkins/heapdump.log -verbose:gc -Xloggc:/var/log/jenkins/gc-%t.log -XX:NumberOfGCLogFiles=2 -XX:+UseGCLogFileRotation -XX:GCLogFileSize=100m -XX:+PrintGC -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:+PrintHeapAtGC -XX:+PrintGCCause -XX:+PrintTenuringDistribution -XX:+PrintReferenceGC -XX:+PrintAdaptiveSizePolicy -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+ParallelRefProcEnabled -XX:+ExplicitGCInvokesConcurrent -XX:+UnlockDiagnosticVMOptions -XX:G1SummarizeRSetStatsPeriod=1 -XX:MaxMetaspaceExpansion=64M -Djenkins.model.Jenkins.logStartupPerformance=true"
 ENV JAVA_OPTS="-Xms4g -Xmx8g $JENKINS_JAVA_PARAMETERS -Djava.awt.headless=true -Dhudson.slaves.WorkspaceList='_' -Dhudson.model.ParametersAction.keepUndefinedParameters=true -Dorg.jenkinsci.plugins.gitclient.Git.timeOut=30 -Dorg.eclipse.jetty.server.Request.maxFormContentSize=1000000"
diff --git a/jessie-amd64-jenkins-master/plugins.txt b/jessie-amd64-jenkins-master/plugins.txt
index f36ac34c..be8dffd0 100644
--- a/jessie-amd64-jenkins-master/plugins.txt
+++ b/jessie-amd64-jenkins-master/plugins.txt
@@ -1,4 +1,4 @@
-ansicolor:0.6.0
+ansicolor:0.6.1
 ant:1.9
 antisamy-markup-formatter:1.5
 apache-httpcomponents-client-4-api:4.5.5-3.0
@@ -8,8 +8,8 @@ build-monitor-plugin:1.12+build.201809061734
 build-name-setter:1.6.9
 build-timeout:1.19
 command-launcher:1.2
-copy-to-slave:1.4.4
 copyartifact:1.41
+copy-to-slave:1.4.4
 coverity:1.11.3
 crowd2:2.0.1
 cvs:2.14
@@ -24,7 +24,7 @@ extended-choice-parameter:0.76
 extended-read-permission:2.0
 external-monitor-job:1.7
 ghprb:1.42.0
-gerrit-trigger:2.27.7
+gerrit-trigger:2.28.0
 github-organization-folder:1.6
 greenballs:1.15
 groovy-postbuild:2.4.3
@@ -63,9 +63,9 @@ throttle-concurrents:2.0.1
 timestamper:1.8.10
 translation:1.16
 urltrigger:0.44
-warnings:4.68
-windows-slaves:1.3.1
+warnings:5.0.0
+windows-slaves:1.4
 workflow-aggregator:2.6
-ws-cleanup:0.36
+ws-cleanup:0.37
 xvfb:1.1.3
-yet-another-docker-plugin:0.1.0-rc49
+yet-another-docker-plugin:0.1.0-rc50
diff --git a/tcwg-base/Dockerfile.in b/tcwg-base/Dockerfile.in
index 38e17c7b..16cedea6 100644
--- a/tcwg-base/Dockerfile.in
+++ b/tcwg-base/Dockerfile.in
@@ -20,11 +20,15 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \
    echo; \
  done) > /etc/apt/sources.list \
 #else
-# Unminimize Ubuntu Bionic to install contrib files of git
-RUN echo y | unminimize \
+# Unminimize Ubuntu Bionic to install contrib files of git (after package
+# update, otherwise unminimize's "apt upgrade" might fail).
+RUN true \
 #endif
  && apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y \
+#if DISTRO_bionic
+ && echo y | unminimize \
+#endif
 #if ARCH_i386
  && dpkg-divert --local --rename --add /sbin/initctl \
  && ln -s /bin/true /sbin/initctl \
@@ -74,12 +78,18 @@ RUN echo y | unminimize \
  libmpc-dev \
  libmpfr-dev \
  libncurses5-dev \
+#if ARCH_amd64 || ARCH_i386
+ libpixman-1-dev \
+#endif
  libpython2.7-dev \
  libreadline-dev \
  libssl-dev \
  libtcnative-1 \
  libtool \
  linux-tools-generic \
+#if DISTRO_bionic
+ linux-tools-4.18.0-13-generic \
+#endif
  lzop \
  make \
 #if ARCH_amd64 || ARCH_i386
@@ -117,6 +127,7 @@ RUN echo y | unminimize \
  texlive-fonts-recommended \
  texlive-latex-recommended \
  time \
+ unifdef \
  valgrind \
  vim \
 #if !DISTRO_trusty
@@ -159,11 +170,10 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
  && cd .. \
  && rm -rf ninja
 
-#if !DISTRO_bionic
 #if ARCH_amd64 || ARCH_i386
 RUN mkdir /tmp/docker-install-qemu.$$ \
  && cd /tmp/docker-install-qemu.$$ \
- && qemu_ver=2.8.0 && wget --progress=dot:giga http://download.qemu-project.org/qemu-${qemu_ver}.tar.xz \
+ && qemu_ver=3.1.0 && wget --progress=dot:giga http://download.qemu-project.org/qemu-${qemu_ver}.tar.xz \
  && tar xf qemu-${qemu_ver}.tar.xz \
  && mkdir build && cd build \
  && ../qemu-${qemu_ver}/configure --prefix=/usr/local --target-list=armeb-linux-user \
@@ -171,10 +181,7 @@ RUN mkdir /tmp/docker-install-qemu.$$ \
  && cd && rm -rf /tmp/docker-install-qemu.$$
 
 #endif
-#else
-# QEMU 2.8 doesn't build cleanly with Ubuntu Bionic's gcc.
 
-#endif
 COPY home-data/ /home-data/
 COPY new-user.sh /usr/local/bin/
 
diff --git a/tcwg-base/home-data/group b/tcwg-base/home-data/group
index 4aac56fc..29de913d 100644
--- a/tcwg-base/home-data/group
+++ b/tcwg-base/home-data/group
@@ -1,3 +1,3 @@
 tcwg-infra:x:9000:tcwg-buildslave,tcwg-benchmark
-tcwg-users:x:10000:maxim.kuvyrkov,alex.bennee,christophe.lyon,peter.smith,thomas.preudhomme,richard.henderson,prathamesh.kulkarni,omair.javaid,kugan.vivekanandarajah,diana.picus,yvan.roux
-tcwg-llvm:x:9001:maxim.kuvyrkov,peter.smith,thomas.preudhomme,omair.javaid,diana.picus,yvan.roux
+tcwg-users:x:10000:maxim.kuvyrkov,alex.bennee,christophe.lyon,peter.smith,richard.henderson,prathamesh.kulkarni,omair.javaid,kugan.vivekanandarajah,diana.picus,yvan.roux
+tcwg-llvm:x:9001:maxim.kuvyrkov,peter.smith,omair.javaid,diana.picus,yvan.roux,prathamesh.kulkarni
diff --git a/tcwg-base/home-data/passwd b/tcwg-base/home-data/passwd
index 9e59db10..f596805f 100644
--- a/tcwg-base/home-data/passwd
+++ b/tcwg-base/home-data/passwd
@@ -4,7 +4,6 @@ alex.bennee:x:10583:10000:Alex Bennée::/bin/bash
 christophe.lyon:x:10033:10000:Christophe Lyon::/bin/bash
 maxim.kuvyrkov:x:10967:10000:Maxim Kuvyrkov::/bin/bash
 peter.smith:x:12314:10000:Peter Smith::/bin/bash
-thomas.preudhomme:x:13851:10000:Thomas Preud'homme::/bin/bash
 richard.henderson:x:13410:10000:Richard Henderson::/bin/bash
 prathamesh.kulkarni:x:11537:10000:Prathamesh Kulkarni::/bin/bash
 omair.javaid:x:10174:10000:Omair Javaid::/bin/bash
diff --git a/tcwg-base/home-data/tcwg-buildslave/.ssh/config b/tcwg-base/home-data/tcwg-buildslave/.ssh/config
index 0f920451..b5086896 100644
--- a/tcwg-base/home-data/tcwg-buildslave/.ssh/config
+++ b/tcwg-base/home-data/tcwg-buildslave/.ssh/config
@@ -6,7 +6,7 @@
 # !!! IMPORTANT NOTE. AS PENANCE, YOU WILL READ THIS NOTE OUT LOUD. !!!
 #
 
-Host *.tcwglab *.aus-colo people.linaro.org aus-colo.linaro.org lab.validation.linaro.org
+Host *.tcwglab people.linaro.org lab.validation.linaro.org
  #User @LDAP_USER@
  #IdentityFile ~/.ssh/id_rsa
 
@@ -20,15 +20,11 @@ Host *proxy.*
 Host *.tcwglab
  ProxyCommand ~/.ssh/ssh-tcwglab-nc.sh -q0 %h %p
 
-# Access to Austin Colo.  E.g., "ssh r1-a7.aus-colo"
-Host *.aus-colo
- ProxyCommand ssh aus-colo.linaro.org nc -q0 %h %p
-
 # Access to LAVA Lab.  E.g., "ssh root@10.7.0.18.lab"
 Host *.lab
  ProxyCommand ssh lab.validation.linaro.org nc -q0 $(basename %h .lab) %p
 
-Host *.tcwglab *.aus-colo *.lab tcwg-d05-01 libgomp-d05 tcwg-thx1-01
+Host *.tcwglab *.lab tcwg-d05-01 libgomp-d05 tcwg-thx1-01
  # Enable automatic multiplexing.
  ControlMaster auto
  # Soften up potential problems with killing master connection by using
@@ -39,13 +35,8 @@ Host *.tcwglab *.aus-colo *.lab tcwg-d05-01 libgomp-d05 tcwg-thx1-01
  # Put the ssh socket on /tmp.  Note that overlayfs can't host sockets,
  # so we always arrange /tmp to be on a ext4 or equivalent FS.
  ControlPath /tmp/ssh-%u-%r@%h:%p
- # There is little point in forwarding X11 to machines outside of local network.
- ForwardX11 no
  # Forward authentication agent and keep private keys in one place.
  ForwardAgent yes
- # Ping server every 5min to avoid routers dropping connection.
- # This matches -o BatchMode=yes setting used in cross-testing (see ABE)
- ServerAliveInterval 300
  # Disable checking of host keys for boards behind gateways.
  # !!! BE BECAREFUL TO ONLY DO THIS FOR MACHINES BEHIND SSH GATEWAY OR VPN !!!
  StrictHostKeyChecking no
@@ -60,7 +51,7 @@ Host ci.linaro.org
 Host git*.linaro.org dev-private-git.linaro.org
  User git
 
-Host tcwg-d05-01 libgomp-d05 tcwg-thx1-01
+Host tcwg-d05-01 libgomp-d05 tcwg-thx1-01 tcwg-sq-*.tcwglab
  Port 2022
 
 Host tcwg-d05-01 libgomp-d05
@@ -71,4 +62,11 @@ Host tcwg-thx1-01
 
 Host tcwg-ex40-01 ex40-01
  Hostname ex40-01.tcwglab.linaro.org
+
+Host *
+ # There is little point in forwarding X11 to machines outside of local network.
+ ForwardX11 no
+ # Ping server every 5min to avoid routers dropping connection.
+ # This matches -o BatchMode=yes setting used in cross-testing (see ABE)
+ ServerAliveInterval 300
 # === END: TCWG SSH configuration ===
diff --git a/tcwg-base/home-data/tcwg-buildslave/.ssh/known_hosts b/tcwg-base/home-data/tcwg-buildslave/.ssh/known_hosts
index a1a108b4..910daa41 100644
--- a/tcwg-base/home-data/tcwg-buildslave/.ssh/known_hosts
+++ b/tcwg-base/home-data/tcwg-buildslave/.ssh/known_hosts
@@ -3,6 +3,7 @@ aus-colo.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBALdjDe/FnDjKDz+QzKWD/J1jIVVjied+
 aus-colo.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCg5vMfuBLRroqEb6+CFLQikh1Wq6UD++SODY7bSdPDfN1wmurdp60AdVU+22nOXgK78mwYPJ0PEcTBMSE+OmryfZFDZm/+aPbALid/vFs8NuvFmEQ8vecEBPDGxJ3RpVxkNG5BrWMTJjWMJTCFdIh9my5vhBPEloAuDRthRNaRwvgqRw3GJAbSG2Cg4ZgOQi7Lv3ogQ/M3nXzy8KMp4KD7AtncylguPoVwDxNwjl+YoEujZDvpM4UiZDnh+Gxeru3EnEIgDvwbMizlrKL8Tm+2gA+j3cWkgIjCVJM+PW8V0aobp681ChqlbDlzK0oVmwUafdVv3dxzOSrjQH2rkaOn
 [ci.linaro.org]:2020 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJW1L7ZeT7dC/otESvOQl8KZ/VlV08z0rmUPwwVJvDbuAlh6Qpn5LVPRe7IFEU/qePQQEKzn1Kw7x6Ces3e5mck=
 [ci.linaro.org]:2020 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzIJCEw5MSW713q3I95jORM6fkdx22Z+eeanVvAy8fGssvh0QHZtG8kpesQLWmtaOxkkRwURK+ui4OnoO/FCaRGWX0SUpnHxPF23OcwejLGXX9uAhtFY8s2hyvdrWDyB4vGjNjqT8NhnciETy3WNV0D0tKCfwEy6WkjIM0B9acrDxhYYDLqSXWUBAdJ7J8Mgg/L1nAPWM8DC0H+5SmzYvfxxnzprq/EvLDL950262WN10nzx2KsFD0zCW4eggp2Qcqa5XX6Ou/gHfIW8J8gncOjfpR4c6DN9NS7rX71F7BsLhkMwu1GwKhf09qvtGT3LdR2ilNOG36Uvq7WksiBofr
+[ci.linaro.org]:2222 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCAxH/zCl/clVrd2Q8Tai5wea0homs6uPPf57qemRP/MFHOz4cIYKEbEczLD87b8u2dK+qfjKsr33jSmW8NbJbvJZ6bFhVUcpXl2BxAYbFQVZJq5YDsDEmRFbvkjzEjiRGHMKCl8ouh1c5lTLkLAKZMu2cKc7X0sIMqwrwOPn/RE8cCrDYkhxTZy2IJ8O8MrJoXmwjiT5mJpe5y7kGVzzESvHBbhtknLa5HuYuyzU88Zyi8m6LjJc9OOTxPBuXiO1c7Oblq7q2Sjk7X+iDld1+m+uUkI2Bro5P2oxneapx2As6R9IUc3zd+YGWcjSiI1CnCb1EykIBzS+yKDfoPg+M7
 dev-private-git.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOvq8E5HPzrBlxmckzsE3rz9LAx9c0faEfofALaO+UGC4HAst9fMaZcHaCqu+b8SVY/2VcBvMYMwO1ZPgOn0rXs=
 dev-private-git.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAK10xjDXtqiW6S02TFvIQUmjTyu+tpiT0IVTp5dlZX5rT1EDi4DtRgtoO/R4WncAs0GE8FqaI/IqljuYlJbHOrFCxU3OWKB+z2Ue3oXs3kouoFP3coF4exBZLEBX4JQ/HI5Ii88fnE/U70/+wN/mMAtcOrsgGWGXOv8yFZEQaKJJAAAAFQCfVbaD5KdaABTLwQ8CXRuZ+PAeHwAAAIBmppcf9sx9M4KAgiOQRGW+7/eImJHFRazQSe8Qbiqo0H7OQhIRcLIm6+PAtKgxxSaQErAo4z/xM7d2lhqOyydK5GDpILgV3qHUFAgQ9vajL+ga5/VeRTqg6R91kYgIKnEl3y8/iW6eRcJF/jzYfDcaFG0Z3gsOtHzjTsCuV8KMLwAAAIBupI2LDTsUYa64hSKvGhEVPMj8VKx5RX4NWQU/dlNNhlFRTzV42giujZ146vH5SGqagR3daX+o6Xm++GDJ+AedzJ8zBc9dAwU7ao4fd23bsyURvNxC7K5DKJnlCDS6xk+6wv6Hz9VdbaIEE5TPxSGqZEOK1V+pbgv+cMUGACy43Q==
 dev-private-git.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC34bjTOKJIq8MVSeC5gddQlbR0hyvvTZbrpW7KXgCzkLTFZxa05wbz8VC1l7ruPotQBgrICgLYmrbjrASqcY//9OPLDa1Pf/MUIu2F2lA1W/5E3psGYmyC9GTvmjKgu39Rad5ujXMeMLjuzVPCmo+WhewgugDSV4Fcggd6B6YXHGtoE15ctSw4moerUq1+2BXVgFxUyMoGcpSCeLnbvWpmi6xWoGQOSnrQ4Z/VmZ5WZ87vQsiiWEAsqmMOHHacunnSph7uzQXJlHNajdeGnr2NF+EgcmQ0N6vivZDRLmRYuSmizjCOHSRZxSm/0UJC/ewVzp9BwRepiNKWsjb4gTMb
diff --git a/tcwg-base/home-data/thomas.preudhomme/.ssh/authorized_keys b/tcwg-base/home-data/thomas.preudhomme/.ssh/authorized_keys
deleted file mode 100644
index 68d7168d..00000000
--- a/tcwg-base/home-data/thomas.preudhomme/.ssh/authorized_keys
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDFtoCUhkeZ3yC2s7oUfSrM33SVgBKLGJ/4FiEGnQRmU1g8rxuOyDOscGz6AIHDNfYcBZGgwHVu5rBd+w+GKZf89kzc6apqBCNmPXUX9vJleb8otqgDL9msifgGOjhDyWVd5pdW6MFzmWMIJyBbY+D3JguUgAMSHMiGh5Sf4+pskn6XOCqnKGbLYRMwpAD1u7ket/liAZnagFP1CuTCgNkmvnFzEw5a4bOdVYtp9x20LYq0L0OMSNhT4KajxUmxgEteLuKCXaafgPgIWq6B8skqkZzyVSU2+RR2Yd6wGQgP6fRFCh84lo59otU5C7VacYqryzCyfdiiE5FXzh94ypu0uKtnq4nSz9DUeL/TAcjr+Y+jAfgwCm087SK/WIPhF37yd6/b/AEeF/4mT8jAR+h74u8ULR9mRkWirBEldG2I80C9p916h73lrc9Vta7CA7XzseIHSKv1S1OQlkCMF8Jj4AwMTF5DOXLju9WNF17OAP44IMEJvpG2HcxTPLbrHd9GX2G4PDzJBaIuaFybJIQH28ZpbIVKpx6iVtPFQ2ehRh+STi7rApgLGPiKjwKYskLnpLcoCyhhyw8BpW7SQ4U690ZcPEboYDF5sqPwEP3EKmrXBG3siUNmlnrLY0E/INON/SKEHAgAAxKm2s4UhtnrfN3y1Wh1ILPRnJq6Fk3K3w== thopre01@e108577-lin
diff --git a/tcwg-base/tcwg-build/Dockerfile.in b/tcwg-base/tcwg-build/Dockerfile.in
index 5cd51cfe..9033a56b 100644
--- a/tcwg-base/tcwg-build/Dockerfile.in
+++ b/tcwg-base/tcwg-build/Dockerfile.in
@@ -13,12 +13,16 @@ RUN while read line; do \
 # Install wine.  On amd64 arch we need to enable i386, otherwise wine
 # won't meet dependencies (this is the case at least for trusty and xenial).
 RUN \
-#if ARCH_amd64
+#if ARCH_amd64 && (DISTRO_trusty || DISTRO_xenial)
  dpkg --add-architecture i386 && \
 #endif
  apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+#if DISTRO_trusty || DISTRO_xenial
  wine \
+#else
+ wine-stable \
+#endif
  && apt-get clean \
  && rm -rf \
  /var/lib/apt/lists/* \
diff --git a/tcwg-base/tcwg-dev/Dockerfile.in b/tcwg-base/tcwg-dev/Dockerfile.in
index 518a5032..4aed65d8 100644
--- a/tcwg-base/tcwg-dev/Dockerfile.in
+++ b/tcwg-base/tcwg-dev/Dockerfile.in
@@ -2,15 +2,6 @@ FROM linaro/ci-#{ARCH}-tcwg-base-ubuntu:#{DISTRO}
 
 RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y \
- software-properties-common \
- && apt-get clean \
- && rm -rf \
- /var/lib/apt/lists/* \
- /tmp/* \
- /var/tmp/*
-
-RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y \
  apt-file \
  git-gui \
  git-svn \
@@ -25,9 +16,9 @@ RUN apt-get update \
  locales \
  mc \
  screen \
+ software-properties-common \
  stgit \
  tmux \
- unifdef \
  && apt-get clean \
  && rm -rf \
  /var/lib/apt/lists/* \
diff --git a/tcwg-base/tcwg-dev/tcwg-x2go/Dockerfile.in b/tcwg-base/tcwg-dev/tcwg-x2go/Dockerfile.in
index 5191918a..35853ad5 100644
--- a/tcwg-base/tcwg-dev/tcwg-x2go/Dockerfile.in
+++ b/tcwg-base/tcwg-dev/tcwg-x2go/Dockerfile.in
@@ -11,19 +11,10 @@ RUN apt-get update \
  /tmp/* \
  /var/tmp/*
 
-#if DISTRO_xenial
-RUN add-apt-repository ppa:x2go/stable \
-#else
-RUN true \
-#endif
- && apt-get update \
+RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y \
  duplicity \
  mate-desktop-environment \
-#if DISTRO_xenial
- x2godesktopsharing \
- x2gomatebindings \
-#endif
  x2goserver \
  x2goserver-xsession \
  && apt-get clean \
diff --git a/tcwg-base/tcwg-llvmbot/Dockerfile.in b/tcwg-base/tcwg-llvmbot/Dockerfile.in
index 4d8873b0..5771509b 100644
--- a/tcwg-base/tcwg-llvmbot/Dockerfile.in
+++ b/tcwg-base/tcwg-llvmbot/Dockerfile.in
@@ -1,8 +1,12 @@
 FROM linaro/ci-#{ARCH}-tcwg-base-ubuntu:#{DISTRO}
 
 RUN apt-get update \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common \
+ && DEBIAN_FRONTEND=noninteractive add-apt-repository -y ppa:ubuntu-toolchain-r/test \
+ && apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y \
  buildbot \
+ g++-7 \
  && apt-get clean \
  && rm -rf \
  /var/lib/apt/lists/* \
diff --git a/tcwg-base/tcwg-llvmbot/run.sh b/tcwg-base/tcwg-llvmbot/run.sh
index d3308d49..04bd6450 100755
--- a/tcwg-base/tcwg-llvmbot/run.sh
+++ b/tcwg-base/tcwg-llvmbot/run.sh
@@ -72,8 +72,8 @@ fi
 if use_clang_p $2 ; then
     setup_clang_release $2
 else
-    cc=gcc
-    cxx=g++
+    cc=gcc-7
+    cxx=g++-7
 fi
 
 # With default PATH /usr/local/bin/cc and /usr/local/bin/c++ are detected as
diff --git a/tcwg-base/tcwg-llvmbot/start.sh b/tcwg-base/tcwg-llvmbot/start.sh
index 264ac899..f337f967 100755
--- a/tcwg-base/tcwg-llvmbot/start.sh
+++ b/tcwg-base/tcwg-llvmbot/start.sh
@@ -25,6 +25,37 @@ else
     DOCKER="sudo docker"
 fi
 
+case "$slavename" in
+  linaro-armv8-01-aarch64-full) ;;
+  linaro-armv8-01-aarch64-global-isel) ;;
+  linaro-armv8-01-aarch64-libcxx) ;;
+  linaro-armv8-01-aarch64-libcxx-noeh) ;;
+  linaro-armv8-01-aarch64-lld) ;;
+  linaro-armv8-01-aarch64-quick) ;;
+  linaro-armv8-01-arm-full) ;;
+  linaro-armv8-01-arm-full-selfhost) ;;
+  linaro-armv8-01-arm-global-isel) ;;
+  linaro-armv8-01-arm-libcxx) ;;
+  linaro-armv8-01-arm-libcxx-noeh) ;;
+  linaro-armv8-01-arm-lld) ;;
+  linaro-armv8-01-arm-lnt) ;;
+  linaro-armv8-01-arm-quick) ;;
+  linaro-armv8-01-arm-selfhost-neon) ;;
+  linaro-tk1-*) ;;
+  *)
+    echo "WARNING: Unknown slavename $slavename"
+esac
+
+case "$slavename:$image" in
+  *-aarch64-*:*-arm64-*) ;;
+  *-arm-*:*-armhf-*) ;;
+  linaro-tk1-*:*-armhf-*) ;;
+  *)
+    echo "ERROR: $slavename should not run on $image."
+    echo "Make sure you're running an AArch64 bot on an arm64 image or an ARM bot on an armhf image."
+    exit 1
+esac
+
 case "$buildmaster" in
     "normal")
 	mastername="normal"
diff --git a/trusty-amd64-art/Dockerfile b/trusty-amd64-art/Dockerfile
deleted file mode 100644
index 650c3054..00000000
--- a/trusty-amd64-art/Dockerfile
+++ /dev/null
@@ -1,63 +0,0 @@
-FROM ubuntu:trusty
-
-RUN dpkg --add-architecture i386 \
- && apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends software-properties-common \
- && add-apt-repository -y ppa:git-core/ppa \
- && add-apt-repository -y ppa:linaro-maintainers/tools \
- && apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
- acpica-tools \
- android-tools-adb \
- bc \
- bison \
- ccache \
- clang \
- curl \
- default-jdk \
- gcc-4.6 \
- g++-multilib \
- genisoimage \
- git \
- gperf \
- lcov \
- less \
- lib32ncurses5 \
- libxml2-utils \
- make \
- openssh-client \
- openssh-server \
- python-mako \
- python-networkx \
- python-requests \
- rsync \
- scons \
- time \
- unzip \
- wget \
- xml-twig-tools \
- zip \
- zlib1g-dev:i386 \
- && wget -q \
- http://snapshot.debian.org/archive/debian/20160609T104519Z/pool/main/a/acpica-unix/acpica-tools_20160527-1_amd64.deb \
- http://de.archive.ubuntu.com/ubuntu/pool/main/m/make-dfsg/make_3.81-8.2ubuntu3_amd64.deb \
- http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre-headless_8u45-b14-1_amd64.deb \
- http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre_8u45-b14-1_amd64.deb \
- http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk_8u45-b14-1_amd64.deb \
- && dpkg -i --force-all *.deb \
- && apt-mark hold make \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* *.deb
-
-RUN useradd -m -G plugdev buildslave \
- && echo 'buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \
- && chmod 0440 /etc/sudoers.d/jenkins \
- && mkdir -p /var/run/sshd /home/buildslave/bin \
- && curl https://raw.githubusercontent.com/google/styleguide/gh-pages/cpplint/cpplint.py > /home/buildslave/bin/cpplint.py \
- && curl https://storage.googleapis.com/git-repo-downloads/repo > /home/buildslave/bin/repo \
- && chmod a+x /home/buildslave/bin/* \
- && chown -R buildslave:buildslave /home/buildslave/bin
-
-EXPOSE 22
-CMD ["/usr/sbin/sshd", "-D"]
diff --git a/trusty-amd64-art/build.sh b/trusty-amd64-art/build.sh
deleted file mode 100755
index 14167821..00000000
--- a/trusty-amd64-art/build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-export LANG=C
-
-DISTRIBUTION=$(basename ${PWD} | cut -f1 -d '-')
-ARCHITECTURE=$(basename ${PWD} | cut -f2 -d '-')
-
-image=linaro/ci-${ARCHITECTURE}-art-ubuntu:${DISTRIBUTION}
-docker build --pull --tag=$image .
-echo $image > .docker-tag
diff --git a/trusty-amd64-tcwg-base/Dockerfile b/trusty-amd64-tcwg-base/Dockerfile
index 00b9e42a..e31b6105 100644
--- a/trusty-amd64-tcwg-base/Dockerfile
+++ b/trusty-amd64-tcwg-base/Dockerfile
@@ -52,6 +52,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
  libmpc-dev \
  libmpfr-dev \
  libncurses5-dev \
+ libpixman-1-dev \
  libpython2.7-dev \
  libreadline-dev \
  libssl-dev \
@@ -83,6 +84,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
  texlive-fonts-recommended \
  texlive-latex-recommended \
  time \
+ unifdef \
  valgrind \
  vim \
  python-virtualenv \
@@ -123,13 +125,14 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
 
 RUN mkdir /tmp/docker-install-qemu.$$ \
  && cd /tmp/docker-install-qemu.$$ \
- && qemu_ver=2.8.0 && wget --progress=dot:giga http://download.qemu-project.org/qemu-${qemu_ver}.tar.xz \
+ && qemu_ver=3.1.0 && wget --progress=dot:giga http://download.qemu-project.org/qemu-${qemu_ver}.tar.xz \
  && tar xf qemu-${qemu_ver}.tar.xz \
  && mkdir build && cd build \
  && ../qemu-${qemu_ver}/configure --prefix=/usr/local --target-list=armeb-linux-user \
  && make all install -j $(nproc --all) \
  && cd && rm -rf /tmp/docker-install-qemu.$$
 
+
 COPY home-data/ /home-data/
 COPY new-user.sh /usr/local/bin/
 
@@ -147,4 +150,4 @@ VOLUME /tmp
 
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
-# checksum: 7308a6409f6d660bac7bbed08fd6aff5
+# checksum: af4fa2fbc82a8ade63491e2a489bb96b
diff --git a/trusty-amd64-tcwg-base/trusty-amd64-tcwg-dev/Dockerfile b/trusty-amd64-tcwg-base/trusty-amd64-tcwg-dev/Dockerfile
index 418f3df2..c1e25ee6 100644
--- a/trusty-amd64-tcwg-base/trusty-amd64-tcwg-dev/Dockerfile
+++ b/trusty-amd64-tcwg-base/trusty-amd64-tcwg-dev/Dockerfile
@@ -3,15 +3,6 @@ FROM linaro/ci-amd64-tcwg-base-ubuntu:trusty
 
 RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y \
- software-properties-common \
- && apt-get clean \
- && rm -rf \
- /var/lib/apt/lists/* \
- /tmp/* \
- /var/tmp/*
-
-RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y \
  apt-file \
  git-gui \
  git-svn \
@@ -20,9 +11,9 @@ RUN apt-get update \
  locales \
  mc \
  screen \
+ software-properties-common \
  stgit \
  tmux \
- unifdef \
  && apt-get clean \
  && rm -rf \
  /var/lib/apt/lists/* \
@@ -40,4 +31,4 @@ COPY run.sh start.sh /
 
 ENTRYPOINT ["/run.sh"]
 CMD ["start.sh"]
-# checksum: 75b9df5abd08ace1683a38ae0107abcd
+# checksum: 4b050cb9917e9068a64dccf1f6d4f57a
diff --git a/trusty-arm64-tcwg-base/Dockerfile b/trusty-arm64-tcwg-base/Dockerfile
index b737df42..2d20e996 100644
--- a/trusty-arm64-tcwg-base/Dockerfile
+++ b/trusty-arm64-tcwg-base/Dockerfile
@@ -76,6 +76,7 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \
  texlive-fonts-recommended \
  texlive-latex-recommended \
  time \
+ unifdef \
  valgrind \
  vim \
  python-virtualenv \
@@ -114,6 +115,7 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
  && cd .. \
  && rm -rf ninja
 
+
 COPY home-data/ /home-data/
 COPY new-user.sh /usr/local/bin/
 
@@ -131,4 +133,4 @@ VOLUME /tmp
 
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
-# checksum: 8e27f9af3198d0de8cea0cc95b24af3e
+# checksum: 9a5ebe95dcd5b6352f12f31a90067e8e
diff --git a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-dev/Dockerfile b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-dev/Dockerfile
index 6d6a303f..e26b4d27 100644
--- a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-dev/Dockerfile
+++ b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-dev/Dockerfile
@@ -3,15 +3,6 @@ FROM linaro/ci-arm64-tcwg-base-ubuntu:trusty
 
 RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y \
- software-properties-common \
- && apt-get clean \
- && rm -rf \
- /var/lib/apt/lists/* \
- /tmp/* \
- /var/tmp/*
-
-RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y \
  apt-file \
  git-gui \
  git-svn \
@@ -19,9 +10,9 @@ RUN apt-get update \
  locales \
  mc \
  screen \
+ software-properties-common \
  stgit \
  tmux \
- unifdef \
  && apt-get clean \
  && rm -rf \
  /var/lib/apt/lists/* \
@@ -39,4 +30,4 @@ COPY run.sh start.sh /
 
 ENTRYPOINT ["/run.sh"]
 CMD ["start.sh"]
-# checksum: bae8d9026b39936255d5c03147dffbb7
+# checksum: dc6a18a98fea5a25a5193d4e57b5a59d
diff --git a/trusty-armhf-tcwg-base/Dockerfile b/trusty-armhf-tcwg-base/Dockerfile
index 215fd204..bb6b66c8 100644
--- a/trusty-armhf-tcwg-base/Dockerfile
+++ b/trusty-armhf-tcwg-base/Dockerfile
@@ -76,6 +76,7 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \
  texlive-fonts-recommended \
  texlive-latex-recommended \
  time \
+ unifdef \
  valgrind \
  vim \
  python-virtualenv \
@@ -114,6 +115,7 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
  && cd .. \
  && rm -rf ninja
 
+
 COPY home-data/ /home-data/
 COPY new-user.sh /usr/local/bin/
 
@@ -131,4 +133,4 @@ VOLUME /tmp
 
 EXPOSE 22
 CMD ["linux32", "/usr/sbin/sshd", "-D"]
-# checksum: 3dfbe6166ed6366e2a6a635d9af51c07
+# checksum: 43dd94b79ec30383f8b930e4d0d36681
diff --git a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-dev/Dockerfile b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-dev/Dockerfile
index 64d3ab97..6cddb9ac 100644
--- a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-dev/Dockerfile
+++ b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-dev/Dockerfile
@@ -3,15 +3,6 @@ FROM linaro/ci-armhf-tcwg-base-ubuntu:trusty
 
 RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y \
- software-properties-common \
- && apt-get clean \
- && rm -rf \
- /var/lib/apt/lists/* \
- /tmp/* \
- /var/tmp/*
-
-RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y \
  apt-file \
  git-gui \
  git-svn \
@@ -20,9 +11,9 @@ RUN apt-get update \
  locales \
  mc \
  screen \
+ software-properties-common \
  stgit \
  tmux \
- unifdef \
  && apt-get clean \
  && rm -rf \
  /var/lib/apt/lists/* \
@@ -40,4 +31,4 @@ COPY run.sh start.sh /
 
 ENTRYPOINT ["linux32", "/run.sh"]
 CMD ["start.sh"]
-# checksum: 6d5a31fd3800e81abbdebdb08d87c819
+# checksum: 3da6f55017f367a840b7513fb3479177
diff --git a/trusty-i386-tcwg-base/Dockerfile b/trusty-i386-tcwg-base/Dockerfile
index 538c7356..c0a61ece 100644
--- a/trusty-i386-tcwg-base/Dockerfile
+++ b/trusty-i386-tcwg-base/Dockerfile
@@ -54,6 +54,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
  libmpc-dev \
  libmpfr-dev \
  libncurses5-dev \
+ libpixman-1-dev \
  libpython2.7-dev \
  libreadline-dev \
  libssl-dev \
@@ -84,6 +85,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
  texlive-fonts-recommended \
  texlive-latex-recommended \
  time \
+ unifdef \
  valgrind \
  vim \
  python-virtualenv \
@@ -124,13 +126,14 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
 
 RUN mkdir /tmp/docker-install-qemu.$$ \
  && cd /tmp/docker-install-qemu.$$ \
- && qemu_ver=2.8.0 && wget --progress=dot:giga http://download.qemu-project.org/qemu-${qemu_ver}.tar.xz \
+ && qemu_ver=3.1.0 && wget --progress=dot:giga http://download.qemu-project.org/qemu-${qemu_ver}.tar.xz \
  && tar xf qemu-${qemu_ver}.tar.xz \
  && mkdir build && cd build \
  && ../qemu-${qemu_ver}/configure --prefix=/usr/local --target-list=armeb-linux-user \
  && make all install -j $(nproc --all) \
  && cd && rm -rf /tmp/docker-install-qemu.$$
 
+
 COPY home-data/ /home-data/
 COPY new-user.sh /usr/local/bin/
 
@@ -148,4 +151,4 @@ VOLUME /tmp
 
 EXPOSE 22
 CMD ["linux32", "/usr/sbin/sshd", "-D"]
-# checksum: 45b6db837958fc416425896f90378452
+# checksum: 28f82b9ce96b1387fbb2f487e16ab011
diff --git a/utopic-amd64-art/Dockerfile b/utopic-amd64-art/Dockerfile
index 1e134b03..7d749ab7 100644
--- a/utopic-amd64-art/Dockerfile
+++ b/utopic-amd64-art/Dockerfile
@@ -36,6 +36,7 @@ RUN dpkg --add-architecture i386 \
  openssh-client \
  openssh-server \
  patch \
+ parallel \
  python-mako \
  python-networkx \
  python-requests \
@@ -50,9 +51,9 @@ RUN dpkg --add-architecture i386 \
  && wget -q \
  http://snapshot.debian.org/archive/debian/20160609T104519Z/pool/main/a/acpica-unix/acpica-tools_20160527-1_amd64.deb \
  http://de.archive.ubuntu.com/ubuntu/pool/main/m/make-dfsg/make_3.81-8.2ubuntu3_amd64.deb \
- http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre-headless_8u45-b14-1_amd64.deb \
- http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre_8u45-b14-1_amd64.deb \
- http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk_8u45-b14-1_amd64.deb \
+ http://mirrors.edge.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre-headless_8u181-b13-1_amd64.deb \
+ http://mirrors.edge.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre_8u181-b13-1_amd64.deb \
+ http://mirrors.edge.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk_8u181-b13-1_amd64.deb \
  && dpkg -i --force-all *.deb \
  && apt-mark hold make \
  && apt-get clean \
diff --git a/xenial-amd64-tcwg-base/Dockerfile b/xenial-amd64-tcwg-base/Dockerfile
index aafd062b..4aadf6a4 100644
--- a/xenial-amd64-tcwg-base/Dockerfile
+++ b/xenial-amd64-tcwg-base/Dockerfile
@@ -52,6 +52,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
  libmpc-dev \
  libmpfr-dev \
  libncurses5-dev \
+ libpixman-1-dev \
  libpython2.7-dev \
  libreadline-dev \
  libssl-dev \
@@ -82,6 +83,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
  texlive-fonts-recommended \
  texlive-latex-recommended \
  time \
+ unifdef \
  valgrind \
  vim \
  virtualenv \
@@ -122,13 +124,14 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
 
 RUN mkdir /tmp/docker-install-qemu.$$ \
  && cd /tmp/docker-install-qemu.$$ \
- && qemu_ver=2.8.0 && wget --progress=dot:giga http://download.qemu-project.org/qemu-${qemu_ver}.tar.xz \
+ && qemu_ver=3.1.0 && wget --progress=dot:giga http://download.qemu-project.org/qemu-${qemu_ver}.tar.xz \
  && tar xf qemu-${qemu_ver}.tar.xz \
  && mkdir build && cd build \
  && ../qemu-${qemu_ver}/configure --prefix=/usr/local --target-list=armeb-linux-user \
  && make all install -j $(nproc --all) \
  && cd && rm -rf /tmp/docker-install-qemu.$$
 
+
 COPY home-data/ /home-data/
 COPY new-user.sh /usr/local/bin/
 
@@ -146,4 +149,4 @@ VOLUME /tmp
 
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
-# checksum: f778089ba7fd8f42cc9b5a52582218cf
+# checksum: 45c951efede684cca687084277d49621
diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/Dockerfile b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/Dockerfile
index 0b29ea73..3a589c73 100644
--- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/Dockerfile
+++ b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/Dockerfile
@@ -3,15 +3,6 @@ FROM linaro/ci-amd64-tcwg-base-ubuntu:xenial
 
 RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y \
- software-properties-common \
- && apt-get clean \
- && rm -rf \
- /var/lib/apt/lists/* \
- /tmp/* \
- /var/tmp/*
-
-RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y \
  apt-file \
  git-gui \
  git-svn \
@@ -20,9 +11,9 @@ RUN apt-get update \
  locales \
  mc \
  screen \
+ software-properties-common \
  stgit \
  tmux \
- unifdef \
  && apt-get clean \
  && rm -rf \
  /var/lib/apt/lists/* \
@@ -40,4 +31,4 @@ COPY run.sh start.sh /
 
 ENTRYPOINT ["/run.sh"]
 CMD ["start.sh"]
-# checksum: a4c4ebd86e96ff16460d2e83d0e6ee51
+# checksum: f54252755ff04b9508233acaee33cd32
diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/Dockerfile b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/Dockerfile
deleted file mode 100644
index a7909d59..00000000
--- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/Dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Auto generated from tcwg-base/tcwg-dev/tcwg-x2go/Dockerfile.in. Do not edit.
-FROM linaro/ci-amd64-tcwg-dev-ubuntu:xenial
-
-COPY start.sh .
-
-RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y \
- ubuntu-desktop \
- && apt-get clean \
- && rm -rf \
- /var/lib/apt/lists/* \
- /tmp/* \
- /var/tmp/*
-
-RUN add-apt-repository ppa:x2go/stable \
- && apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y \
- duplicity \
- mate-desktop-environment \
- x2godesktopsharing \
- x2gomatebindings \
- x2goserver \
- x2goserver-xsession \
- && apt-get clean \
- && rm -rf \
- /var/lib/apt/lists/* \
- /tmp/* \
- /var/tmp/*
-
-RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y \
- ddd \
- && apt-get clean \
- && rm -rf \
- /var/lib/apt/lists/* \
- /tmp/* \
- /var/tmp/*
-# checksum: 3e1c139ac1715b1096130c6e90c55fc9
diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/build.sh b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/build.sh
deleted file mode 120000
index 6e52e4e6..00000000
--- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/build.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../tcwg-base/tcwg-dev/tcwg-x2go/build.sh
\ No newline at end of file
diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/gerrit-branches b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/gerrit-branches
deleted file mode 120000
index 748350c7..00000000
--- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/gerrit-branches
+++ /dev/null
@@ -1 +0,0 @@
-../../../tcwg-base/tcwg-dev/tcwg-x2go/gerrit-branches
\ No newline at end of file
diff --git a/xenial-arm64-tcwg-base/Dockerfile b/xenial-arm64-tcwg-base/Dockerfile
index 907d7bbd..2ba6c04f 100644
--- a/xenial-arm64-tcwg-base/Dockerfile
+++ b/xenial-arm64-tcwg-base/Dockerfile
@@ -77,6 +77,7 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \
  texlive-fonts-recommended \
  texlive-latex-recommended \
  time \
+ unifdef \
  valgrind \
  vim \
  virtualenv \
@@ -115,6 +116,7 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
  && cd .. \
  && rm -rf ninja
 
+
 COPY home-data/ /home-data/
 COPY new-user.sh /usr/local/bin/
 
@@ -132,4 +134,4 @@ VOLUME /tmp
 
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
-# checksum: 88489a438585f2999c9bcf500a7fc497
+# checksum: 5d69a0e67de38ed9fb2fd87244c1b6ce
diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-dev/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-dev/Dockerfile
index dae83c0a..db0cd0ba 100644
--- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-dev/Dockerfile
+++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-dev/Dockerfile
@@ -3,15 +3,6 @@ FROM linaro/ci-arm64-tcwg-base-ubuntu:xenial
 
 RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y \
- software-properties-common \
- && apt-get clean \
- && rm -rf \
- /var/lib/apt/lists/* \
- /tmp/* \
- /var/tmp/*
-
-RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y \
  apt-file \
  git-gui \
  git-svn \
@@ -20,9 +11,9 @@ RUN apt-get update \
  locales \
  mc \
  screen \
+ software-properties-common \
  stgit \
  tmux \
- unifdef \
  && apt-get clean \
  && rm -rf \
  /var/lib/apt/lists/* \
@@ -40,4 +31,4 @@ COPY run.sh start.sh /
 
 ENTRYPOINT ["/run.sh"]
 CMD ["start.sh"]
-# checksum: 2386be7a139346d1966ba5178a04873a
+# checksum: 7d7b7765e822f49af3ecb6fad5353a16
diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile
index 8cfa63bd..439570e5 100644
--- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile
+++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile
@@ -2,8 +2,12 @@
 FROM linaro/ci-arm64-tcwg-base-ubuntu:xenial
 
 RUN apt-get update \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common \
+ && DEBIAN_FRONTEND=noninteractive add-apt-repository -y ppa:ubuntu-toolchain-r/test \
+ && apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y \
  buildbot \
+ g++-7 \
  && apt-get clean \
  && rm -rf \
  /var/lib/apt/lists/* \
@@ -37,4 +41,4 @@ COPY start.sh .
 
 ENTRYPOINT ["/run.sh"]
 CMD ["start.sh"]
-# checksum: bafe407ab78b5988aeac38f590919db9
+# checksum: 3601aae3505cd568a70051c768ab6cd9
diff --git a/xenial-armhf-tcwg-base/Dockerfile b/xenial-armhf-tcwg-base/Dockerfile
index a1df3f56..9964f843 100644
--- a/xenial-armhf-tcwg-base/Dockerfile
+++ b/xenial-armhf-tcwg-base/Dockerfile
@@ -77,6 +77,7 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \
  texlive-fonts-recommended \
  texlive-latex-recommended \
  time \
+ unifdef \
  valgrind \
  vim \
  virtualenv \
@@ -115,6 +116,7 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
  && cd .. \
  && rm -rf ninja
 
+
 COPY home-data/ /home-data/
 COPY new-user.sh /usr/local/bin/
 
@@ -132,4 +134,4 @@ VOLUME /tmp
 
 EXPOSE 22
 CMD ["linux32", "/usr/sbin/sshd", "-D"]
-# checksum: 9e10760c085e078a6a8980804fe4f8b5
+# checksum: 85986dd6dd8ddc162d40addb2a4f80b8
diff --git a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-dev/Dockerfile b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-dev/Dockerfile
index 6313187e..49a67cbe 100644
--- a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-dev/Dockerfile
+++ b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-dev/Dockerfile
@@ -3,15 +3,6 @@ FROM linaro/ci-armhf-tcwg-base-ubuntu:xenial
 
 RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y \
- software-properties-common \
- && apt-get clean \
- && rm -rf \
- /var/lib/apt/lists/* \
- /tmp/* \
- /var/tmp/*
-
-RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y \
  apt-file \
  git-gui \
  git-svn \
@@ -20,9 +11,9 @@ RUN apt-get update \
  locales \
  mc \
  screen \
+ software-properties-common \
  stgit \
  tmux \
- unifdef \
  && apt-get clean \
  && rm -rf \
  /var/lib/apt/lists/* \
@@ -40,4 +31,4 @@ COPY run.sh start.sh /
 
 ENTRYPOINT ["linux32", "/run.sh"]
 CMD ["start.sh"]
-# checksum: 3a474d1e7bda6c4bbf9bfa050735d2d4
+# checksum: b8cb9f0df64f714ab0d4514517850f35
diff --git a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/Dockerfile b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/Dockerfile
index 81aad577..7efb553f 100644
--- a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/Dockerfile
+++ b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/Dockerfile
@@ -2,8 +2,12 @@
 FROM linaro/ci-armhf-tcwg-base-ubuntu:xenial
 
 RUN apt-get update \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common \
+ && DEBIAN_FRONTEND=noninteractive add-apt-repository -y ppa:ubuntu-toolchain-r/test \
+ && apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y \
  buildbot \
+ g++-7 \
  && apt-get clean \
  && rm -rf \
  /var/lib/apt/lists/* \
@@ -37,4 +41,4 @@ COPY start.sh .
 
 ENTRYPOINT ["linux32", "/run.sh"]
 CMD ["start.sh"]
-# checksum: b6f879f70c04bfe8edb4e2543cc07115
+# checksum: cf73c99640ab904d9997a941177001f1
diff --git a/xenial-i386-tcwg-base/Dockerfile b/xenial-i386-tcwg-base/Dockerfile
index ff30d7c8..1023b6ed 100644
--- a/xenial-i386-tcwg-base/Dockerfile
+++ b/xenial-i386-tcwg-base/Dockerfile
@@ -54,6 +54,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
  libmpc-dev \
  libmpfr-dev \
  libncurses5-dev \
+ libpixman-1-dev \
  libpython2.7-dev \
  libreadline-dev \
  libssl-dev \
@@ -84,6 +85,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
  texlive-fonts-recommended \
  texlive-latex-recommended \
  time \
+ unifdef \
  valgrind \
  vim \
  virtualenv \
@@ -124,13 +126,14 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
 
 RUN mkdir /tmp/docker-install-qemu.$$ \
  && cd /tmp/docker-install-qemu.$$ \
- && qemu_ver=2.8.0 && wget --progress=dot:giga http://download.qemu-project.org/qemu-${qemu_ver}.tar.xz \
+ && qemu_ver=3.1.0 && wget --progress=dot:giga http://download.qemu-project.org/qemu-${qemu_ver}.tar.xz \
  && tar xf qemu-${qemu_ver}.tar.xz \
  && mkdir build && cd build \
  && ../qemu-${qemu_ver}/configure --prefix=/usr/local --target-list=armeb-linux-user \
  && make all install -j $(nproc --all) \
  && cd && rm -rf /tmp/docker-install-qemu.$$
 
+
 COPY home-data/ /home-data/
 COPY new-user.sh /usr/local/bin/
 
@@ -148,4 +151,4 @@ VOLUME /tmp
 
 EXPOSE 22
 CMD ["linux32", "/usr/sbin/sshd", "-D"]
-# checksum: 7b8b16a11f454fe1a3b6c3d53849dfac
+# checksum: 6250ecddc1d62a1bd9c34d0a1af2b5de
diff --git a/xenial-i386-tcwg-base/xenial-i386-tcwg-dev/Dockerfile b/xenial-i386-tcwg-base/xenial-i386-tcwg-dev/Dockerfile
index e28b47ac..e06816fe 100644
--- a/xenial-i386-tcwg-base/xenial-i386-tcwg-dev/Dockerfile
+++ b/xenial-i386-tcwg-base/xenial-i386-tcwg-dev/Dockerfile
@@ -3,15 +3,6 @@ FROM linaro/ci-i386-tcwg-base-ubuntu:xenial
 
 RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y \
- software-properties-common \
- && apt-get clean \
- && rm -rf \
- /var/lib/apt/lists/* \
- /tmp/* \
- /var/tmp/*
-
-RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y \
  apt-file \
  git-gui \
  git-svn \
@@ -20,9 +11,9 @@ RUN apt-get update \
  locales \
  mc \
  screen \
+ software-properties-common \
  stgit \
  tmux \
- unifdef \
  && apt-get clean \
  && rm -rf \
  /var/lib/apt/lists/* \
@@ -40,4 +31,4 @@ COPY run.sh start.sh /
 
 ENTRYPOINT ["linux32", "/run.sh"]
 CMD ["start.sh"]
-# checksum: 2c75756ab87c198e2cac20109b1addfd
+# checksum: f1db2fea09ca33b4f8f4f94e36a373ec