aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrantisek Sumsal <frantisek@sumsal.cz>2018-11-06 20:55:07 +0100
committerFrantisek Sumsal <frantisek@sumsal.cz>2018-11-06 21:09:45 +0100
commit532a92fbdf186790a0036765b8858c9ae22b60be (patch)
tree9ef10acfaf6573ba05863006ee4e15aec4222227 /travis-ci
parenttravis: drop the unnecessary /etc/machine-id magic (diff)
downloadsystemd-532a92fbdf186790a0036765b8858c9ae22b60be.tar.gz
systemd-532a92fbdf186790a0036765b8858c9ae22b60be.tar.bz2
systemd-532a92fbdf186790a0036765b8858c9ae22b60be.zip
travis: workaround for dnf upgrade
dnf upgrade on Fedora Rawhide pulls in unwanted selinux-policy packages which breaks the system in several ways (and usually ends up with crashed systemd)
Diffstat (limited to 'travis-ci')
-rwxr-xr-xtravis-ci/managers/fedora.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/travis-ci/managers/fedora.sh b/travis-ci/managers/fedora.sh
index 21a5231cc..eed91d0d4 100755
--- a/travis-ci/managers/fedora.sh
+++ b/travis-ci/managers/fedora.sh
@@ -34,9 +34,11 @@ for phase in "${PHASES[@]}"; do
$DOCKER_RUN -v $REPO_ROOT:/build:rw \
-w /build --privileged=true --name $CONT_NAME \
-dit --net=host fedora:$FEDORA_RELEASE /sbin/init
+ # Beautiful workaround for Fedora's version of Docker
+ sleep 1
$DOCKER_EXEC dnf makecache
# Install necessary build/test requirements
- $DOCKER_EXEC dnf -y upgrade
+ $DOCKER_EXEC dnf -y --exclude selinux-policy\* upgrade
$DOCKER_EXEC dnf -y install "${ADDITIONAL_DEPS[@]}"
$DOCKER_EXEC dnf -y builddep systemd
;;