travis: reboot the container before running tests
authorFrantisek Sumsal <fsumsal@redhat.com>
Thu, 17 Jan 2019 11:03:10 +0000 (12:03 +0100)
committerLukáš Nykrýn <lnykryn@redhat.com>
Thu, 17 Jan 2019 12:36:59 +0000 (13:36 +0100)
ci/travis-centos-rhel7.sh
ci/travis-centos-rhel8.sh

index b1b3de1cc2423dda5065b8fafbd9182aeceee4aa..73416798edd279084bfbb1d3d60bc2d2190ad25a 100755 (executable)
@@ -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
index 8eda5e982f4dd5f71676ad97b7061fa5cbec140a..1f72d984e09824daa3a50726d4e687d11173b86d 100755 (executable)
@@ -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"