diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2018-04-06 15:07:52 +0200 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2018-04-06 15:07:52 +0200 |
| commit | 16bff2ff84b8116928ae7fd90364b29abaac0fb4 (patch) | |
| tree | b5a2e291658fdd2aeff429f7d03d35cb9e2997b7 | |
| parent | da385be6c38c5f79b7ee6d175f855c08090d959f (diff) | |
Delete /etc/dpkg/dpkg.cfg.d/excludes on Docker CI images
Fixes test suite on Ubuntu docker images.
| -rw-r--r-- | Dockerfile | 1 | ||||
| -rw-r--r-- | shippable.yml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Dockerfile b/Dockerfile index 76b134003..35db15863 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,5 +7,6 @@ RUN sed -i s#://deb.debian.org#://cdn-fastly.deb.debian.org# /etc/apt/sources.li && env DEBIAN_FRONTEND=noninteractive apt-get install build-essential ccache ninja-build expect curl git -q -y \ && env DEBIAN_FRONTEND=noninteractive ./prepare-release travis-ci \ && dpkg-reconfigure ccache \ + && rm -f /etc/dpkg/dpkg.cfg.d/excludes \ && rm -r /tmp/* \ && apt-get clean diff --git a/shippable.yml b/shippable.yml index 0091b95ea..5aafda9cf 100644 --- a/shippable.yml +++ b/shippable.yml @@ -11,5 +11,6 @@ build: - mkdir build - ( cd build && cmake -DWITH_CURL=OFF .. ) - make -C build -j 4 + - rm -f /etc/dpkg/dpkg.cfg.d/excludes - CTEST_OUTPUT_ON_FAILURE=1 make -C build test - unbuffer ./test/integration/run-tests -q -j 4 |