diff options
| author |  dmarting <dmarting@google.com> | 2017-03-29 13:19:56 +0000 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2017-03-29 19:28:02 +0200 |
| commit | a2ca62445e9b2aea54f194baca28adfef8512a6c (patch) | |
| tree | e463ccd4bbe79d173d2bce9050008248c946c3df /tools/cpp | |
| parent | ebe36f252f527c1835f6c9b57ede4c90a7ef23f1 (diff) | |
Docker tests: deactivate Ubuntu 15.10 and Debian stretch opt
- Ubuntu 15.10 has passed end of life
- Debian stretch is flaky with optimized build (see #2418)
PiperOrigin-RevId: 151567467
Diffstat (limited to 'tools/cpp')
| -rw-r--r-- | tools/cpp/test/BUILD | 2 | ||||
| -rw-r--r-- | tools/cpp/test/Dockerfile.ubuntu-15.10 | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/tools/cpp/test/BUILD b/tools/cpp/test/BUILD index 0a6d5469a8..d1aee01141 100644 --- a/tools/cpp/test/BUILD +++ b/tools/cpp/test/BUILD @@ -64,6 +64,7 @@ pkg_tar( for flavour in FLAVOURS ] +# TODO(#2418): reactivate debian-stretch opt (flaky) [ [py_test( name = "test_cc_configure-%s-%s" % (flavour, mode), @@ -90,6 +91,7 @@ pkg_tar( "fastbuild", ]] for flavour in FLAVOURS + if flavour != "debian-stretch" or mode != "opt" ] filegroup( diff --git a/tools/cpp/test/Dockerfile.ubuntu-15.10 b/tools/cpp/test/Dockerfile.ubuntu-15.10 deleted file mode 100644 index 8c30fa7e00..0000000000 --- a/tools/cpp/test/Dockerfile.ubuntu-15.10 +++ /dev/null @@ -1,8 +0,0 @@ -FROM ubuntu:15.10 -RUN apt-get update && \ - apt-get install -y --no-install-recommends curl ca-certificates \ - git pkg-config zip unzip \ - g++ gcc openjdk-8-jdk \ - zlib1g-dev libarchive-dev \ - ca-certificates-java && \ - apt-get clean |