Merge pull request #16437 from systemd/coverity-gcc-10

coverity: switch back to Fedora 31
coverity: install systemd
2020-07-13 01:42:39 +03:00 · 2020-07-12 22:26:19 +00:00 · 2020-07-12 22:00:16 +00:00
2 changed files with 3 additions and 3 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -45,7 +45,7 @@ jobs:
    - stage: Coverity
      language: bash
      env:
-        - FEDORA_RELEASE="latest"
+        - FEDORA_RELEASE="31"
        - TOOL_BASE="/var/tmp/coverity-scan-analysis"
        - CONT_NAME="coverity-fedora-$FEDORA_RELEASE"
        - DOCKER_EXEC="docker exec -ti $CONT_NAME"
--- a/travis-ci/managers/fedora.sh
+++ b/travis-ci/managers/fedora.sh
@ -65,11 +65,11 @@ for phase in "${PHASES[@]}"; do
            info "Setup phase"
            info "Using Fedora $FEDORA_RELEASE"
            # Pull a Docker image and start a new container
-            docker pull fedora:$FEDORA_RELEASE
+            printf "FROM fedora:$FEDORA_RELEASE\nRUN bash -c 'dnf install -y systemd'\n" | docker build -t fedora-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 fedora:$FEDORA_RELEASE /sbin/init
+                        -dit --net=host fedora-with-systemd/latest /sbin/init
            # Wait for the container to properly boot up, otherwise we were
            # running following dnf commands during the initializing/starting
            # (early/late bootup) phase, which caused nasty race conditions