diff options
| author | Evgeny Vereshchagin <evvers@ya.ru> | 2018-12-08 21:49:52 +0100 |
|---|---|---|
| committer | Evgeny Vereshchagin <evvers@ya.ru> | 2018-12-09 11:31:01 +0100 |
| commit | ee6776b41a28f5c6154fbd4920371eba700659e7 (patch) | |
| tree | 0ab6bae8ad6e8ad33d7e53526efbf3a1a2c4d118 /travis-ci | |
| parent | c90ee83400783739ac6df9f12c43bd7074dea8fa (diff) | |
| download | systemd-ee6776b41a28f5c6154fbd4920371eba700659e7.tar.gz | |
travis: use systemd as PID1 in debian containers
Turns out some tests like `test-execute` are tightly coupled with
systemd as PID1 (which should be fixed of course). In the meantime,
let's see how it goes.
Diffstat (limited to 'travis-ci')
| -rwxr-xr-x | travis-ci/managers/debian.sh | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/travis-ci/managers/debian.sh b/travis-ci/managers/debian.sh index 93d44a70ff..976e926c82 100755 --- a/travis-ci/managers/debian.sh +++ b/travis-ci/managers/debian.sh @@ -30,12 +30,11 @@ for phase in "${PHASES[@]}"; do SETUP) info "Setup phase" info "Using Debian $DEBIAN_RELEASE" - # Pull a Docker image and start a new container - docker pull debian:$DEBIAN_RELEASE + printf "FROM debian:$DEBIAN_RELEASE\nRUN bash -c 'apt-get -y update && apt-get install -y systemd'\n" | docker build -t debian-with-systemd/latest - info "Starting container $CONT_NAME" $DOCKER_RUN -v $REPO_ROOT:/build:rw \ -w /build --privileged=true --name $CONT_NAME \ - -dit --net=host debian:$DEBIAN_RELEASE /bin/bash + -dit --net=host debian-with-systemd/latest /usr/bin/systemd $DOCKER_EXEC bash -c "echo deb-src http://deb.debian.org/debian $DEBIAN_RELEASE main >>/etc/apt/sources.list" $DOCKER_EXEC apt-get -y update $DOCKER_EXEC apt-get -y build-dep systemd @@ -45,10 +44,8 @@ for phase in "${PHASES[@]}"; do info "Run phase" $DOCKER_EXEC meson --werror -Dtests=unsafe -Dslow-tests=true -Dsplit-usr=true build $DOCKER_EXEC ninja -v -C build - # The tests are failing on Travis CI: https://travis-ci.org/systemd/systemd/jobs/464904604 - # so let's skip them for now. - #$DOCKER_EXEC ninja -C build test - #$DOCKER_EXEC tools/check-directives.sh + $DOCKER_EXEC ninja -C build test + $DOCKER_EXEC tools/check-directives.sh ;; RUN_CLANG) docker exec -e CC=clang -e CXX=clang++ -it $CONT_NAME meson --werror -Dtests=unsafe -Dslow-tests=true -Dsplit-usr=true build |