diff options
author | Frantisek Sumsal <fsumsal@redhat.com> | 2019-01-17 12:03:10 +0100 |
---|---|---|
committer | Lukáš Nykrýn <lnykryn@redhat.com> | 2019-01-17 13:36:59 +0100 |
commit | 63e71bda5a00c04c16f330cfc0e6f91e7dcead59 (patch) | |
tree | ea54154e17acb9b8a37ddfaa54a903e4fa841906 | |
parent | a7f87d13f6f7dd92e1f1f7617df531fa34c70b6d (diff) | |
download | systemd-63e71bda5a00c04c16f330cfc0e6f91e7dcead59.tar.gz |
travis: reboot the container before running tests
-rwxr-xr-x | ci/travis-centos-rhel7.sh | 4 | ||||
-rwxr-xr-x | ci/travis-centos-rhel8.sh | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ci/travis-centos-rhel7.sh b/ci/travis-centos-rhel7.sh index b1b3de1cc2..73416798ed 100755 --- a/ci/travis-centos-rhel7.sh +++ b/ci/travis-centos-rhel7.sh @@ -52,6 +52,10 @@ for phase in "${PHASES[@]}"; do --enable-gtk-doc --enable-compat-libs --disable-sysusers \ --disable-ldconfig --enable-lz4 --with-sysvinit-path=/etc/rc.d/init.d $DOCKER_EXEC make + # Let's install the new systemd and "reboot" the container to avoid + # unexpected fails due to incompatibilities with older systemd + $DOCKER_EXEC make install + docker restart $CONT_NAME if ! $DOCKER_EXEC make check; then $DOCKER_EXEC cat test-suite.log exit 1 diff --git a/ci/travis-centos-rhel8.sh b/ci/travis-centos-rhel8.sh index 8eda5e982f..1f72d984e0 100755 --- a/ci/travis-centos-rhel8.sh +++ b/ci/travis-centos-rhel8.sh @@ -113,6 +113,10 @@ for phase in "${PHASES[@]}"; do ) docker exec -it -e CFLAGS='-g -O0 -ftrapv' $CONT_NAME meson build "${CONFIGURE_OPTS[@]}" $DOCKER_EXEC ninja -v -C build + # Let's install the new systemd and "reboot" the container to avoid + # unexpected fails due to incompatibilities with older systemd + $DOCKER_EXEC ninja -C build install + docker restart $CONT_NAME # "Mask" the udev-test.pl, as it requires newer version of systemd-detect-virt # and it's pointless to run it on a VM in a Docker container... echo -ne "#!/usr/bin/perl\nexit(0);\n" > "test/udev-test.pl" |