commit 4e79061f74a03dd9274f88ff42a7e2c0d6adae6c
author Damien Martin-Guillerez <dmarting@google.com> Thu Sep 07 17:00:46 2017 +0200
committer Yun Peng <pcloudy@google.com> Fri Sep 08 09:47:22 2017 +0200
tree 6a390b7afbe4d5419ae2b375a9b746792e5767f2
parent d6a0c413b17e54215ce17707184ba7c7295014a4

Fix debian-stretch test

It works locally, so let see if the problems where only some
docker caching.

Issue #2412

Change-Id: I8f0e00504d17ad1b66b188ba1413ad0df3d3d53d
PiperOrigin-RevId: 167860071

src/test/docker/BUILD

diff --git a/src/test/docker/BUILD b/src/test/docker/BUILD
index 58ef841..da0e7ec 100644
--- a/src/test/docker/BUILD
+++ b/src/test/docker/BUILD
@@ -34,7 +34,6 @@
     "dbg": 3,
 }
 
-# TODO(#2418): reactivate debian-stretch (flaky)
 [
     [py_test(
         name = "test_cc_configure-%s-%s" % (flavour, mode),
@@ -52,11 +51,11 @@
         main = "docker_test.py",
         tags = [
             "docker",
-            "slow",
             "exclusive",
             "local",
+            "slow",
             "shard-%s" % SHARD_NUMBER[mode],
-        ] + (["manual"] if (flavour == "debian-stretch") else []),
+        ],
         deps = ["//third_party/py/gflags"],
     ) for mode in SHARD_NUMBER]
     for flavour in FLAVOURS

src/test/docker/Dockerfile.debian-stretch

diff --git a/src/test/docker/Dockerfile.debian-stretch b/src/test/docker/Dockerfile.debian-stretch
index deb47ee..a1f54fb 100644
--- a/src/test/docker/Dockerfile.debian-stretch
+++ b/src/test/docker/Dockerfile.debian-stretch
@@ -1,8 +1,7 @@
 FROM debian:stretch
-RUN apt-get update
-RUN apt-get install -y --no-install-recommends \
+RUN apt-get update && apt-get install -y --no-install-recommends \
       curl ca-certificates ca-certificates-java \
       git pkg-config build-essential \
       zip unzip zlib1g-dev libarchive-dev \
-      g++ gcc openjdk-8-jdk && \
+      g++ gcc openjdk-8-jdk python && \
     apt-get clean