From aab0bb47fa102b57a7e7c35af78c3f0cb79d05eb Mon Sep 17 00:00:00 2001
From: Pietro Albini <pietro@pietroalbini.org>
Date: Sun, 12 May 2019 18:00:38 +0200
Subject: [PATCH] ci: merge the i1686-gnu images

---
 .azure-pipelines/auto.yml                     |  6 ++----
 src/ci/docker/i686-gnu-2/Dockerfile           | 21 -------------------
 .../{i686-gnu-1 => i686-gnu}/Dockerfile       |  9 ++++++--
 3 files changed, 9 insertions(+), 27 deletions(-)
 delete mode 100644 src/ci/docker/i686-gnu-2/Dockerfile
 rename src/ci/docker/{i686-gnu-1 => i686-gnu}/Dockerfile (54%)

diff --git a/.azure-pipelines/auto.yml b/.azure-pipelines/auto.yml
index facc592422b..e8959e3f17c 100644
--- a/.azure-pipelines/auto.yml
+++ b/.azure-pipelines/auto.yml
@@ -126,10 +126,8 @@ jobs:
 
       asmjs:
         IMAGE: asmjs
-      i686-gnu-1:
-        IMAGE: i686-gnu-1
-      i686-gnu-2:
-        IMAGE: i686-gnu-2
+      i686-gnu:
+        IMAGE: i686-gnu
       i686-gnu-nopt:
         IMAGE: i686-gnu-nopt
       test-various:
diff --git a/src/ci/docker/i686-gnu-2/Dockerfile b/src/ci/docker/i686-gnu-2/Dockerfile
deleted file mode 100644
index b1a0ea6f0e9..00000000000
--- a/src/ci/docker/i686-gnu-2/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM ubuntu:16.04
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-  g++-multilib \
-  make \
-  file \
-  curl \
-  ca-certificates \
-  python2.7 \
-  git \
-  cmake \
-  sudo \
-  gdb \
-  xz-utils
-
-
-COPY scripts/sccache.sh /scripts/
-RUN sh /scripts/sccache.sh
-
-ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu
-ENV SCRIPT make ci-subset-2
diff --git a/src/ci/docker/i686-gnu-1/Dockerfile b/src/ci/docker/i686-gnu/Dockerfile
similarity index 54%
rename from src/ci/docker/i686-gnu-1/Dockerfile
rename to src/ci/docker/i686-gnu/Dockerfile
index 1a04b8af4c1..17441ddb454 100644
--- a/src/ci/docker/i686-gnu-1/Dockerfile
+++ b/src/ci/docker/i686-gnu/Dockerfile
@@ -18,5 +18,10 @@ COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
 ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu
-ENV SCRIPT make ci-subset-1
-
+# Exclude some tests that are unlikely to be platform specific, to speed up
+# this slow job.
+ENV SCRIPT python2.7 ../x.py test \
+  --exclude src/bootstrap \
+  --exclude src/test/rustdoc-js \
+  --exclude src/tools/error_index_generator \
+  --exclude src/tools/linkchecker
-- 
2.44.0