From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Sat, 8 Dec 2018 20:49:52 +0000 (+0100)
Subject: travis: use systemd as PID1 in debian containers
X-Git-Tag: v240~106^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee6776b41a28f5c6154fbd4920371eba700659e7;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/travis-ci/managers/debian.sh b/travis-ci/managers/debian.sh
index 93d44a70ff4..976e926c826 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