diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2017-09-07 17:00:46 +0200 |
|---|---|---|
| committer |  Yun Peng <pcloudy@google.com> | 2017-09-08 09:47:22 +0200 |
| commit | 4e79061f74a03dd9274f88ff42a7e2c0d6adae6c (patch) | |
| tree | 6a390b7afbe4d5419ae2b375a9b746792e5767f2 /src | |
| parent | d6a0c413b17e54215ce17707184ba7c7295014a4 (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/docker/BUILD | 5 | ||||
| -rw-r--r-- | src/test/docker/Dockerfile.debian-stretch | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/test/docker/BUILD b/src/test/docker/BUILD index 58ef8410c9..da0e7ecb06 100644 --- a/src/test/docker/BUILD +++ b/src/test/docker/BUILD @@ -34,7 +34,6 @@ SHARD_NUMBER = { "dbg": 3, } -# TODO(#2418): reactivate debian-stretch (flaky) [ [py_test( name = "test_cc_configure-%s-%s" % (flavour, mode), @@ -52,11 +51,11 @@ SHARD_NUMBER = { 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 diff --git a/src/test/docker/Dockerfile.debian-stretch b/src/test/docker/Dockerfile.debian-stretch index deb47eea36..a1f54fbe89 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 |