diff --git a/test/system/520-checkpoint.bats b/test/system/520-checkpoint.bats index a581f1bf47..5159279e6e 100644 --- a/test/system/520-checkpoint.bats +++ b/test/system/520-checkpoint.bats @@ -132,6 +132,19 @@ function setup() { # bats test_tags=ci:parallel @test "podman checkpoint --export, with volumes" { +# get_host_distribution_info +# if [[ "$HOST_DISTRO_NAME" == "fedora" && "$HOST_DISTRO_RELEASE" == "43" ]]; then +# skip "Broken on Fedora 43: https://github.com/containers/crun/issues/1770" +# fi + local osrelease=/etc/os-release + if [[ -e $osrelease ]]; then + local osid=$(source $osrelease; echo $ID) + local osversion=$(source $osrelease; echo $VERSION_ID) + if [[ $osid == "fedora" && $osversion == "43" ]]; then + skip "Broken on Fedora 43: https://github.com/containers/crun/issues/1770" + fi + fi + skip_if_remote "Test uses --root/--runroot, which are N/A over remote" local p_opts="$(podman_isolation_opts ${PODMAN_TMPDIR}) --events-backend file" diff --git a/test/system/helpers.bash b/test/system/helpers.bash index e61c17f8e0..407d055c4b 100644 --- a/test/system/helpers.bash +++ b/test/system/helpers.bash @@ -41,7 +41,6 @@ if [ $(id -u) -eq 0 ]; then _LOG_PROMPT='#' fi -# Invocations via su may not set this. Although all container tools make # an effort to determine a default if unset, there are corner cases (rootless # namespace preservation) that run before the default is set. # For purposes of system tests (CI, gating, OpenQA) we force a default early. @@ -1371,6 +1370,22 @@ function wait_for_restart_count() { done } +############################ +# Get Host Distribution Info +############################ +function get_host_distribution_info() { + local osrelease=/etc/os-release + if [[ -e $osrelease ]]; then + # shellcheck source=/etc/os-release + HOST_DISTRO_NAME=$(source $osrelease; echo "$ID") + export HOST_DISTRO_NAME + # shellcheck source=/etc/os-release + HOST_DISTRO_RELEASE=$(source $osrelease; echo "$VERSION_ID") + export HOST_DISTRO_RELEASE + fi +} + +# Invocations via su may not set this. Although all container tools make # END miscellaneous tools ############################################################################### diff --git a/test/tmt/system.sh b/test/tmt/system.sh index 3cd29dae03..0a98fc11b0 100644 --- a/test/tmt/system.sh +++ b/test/tmt/system.sh @@ -4,6 +4,8 @@ set -exo pipefail uname -r +cat /etc/os-release + loginctl enable-linger "$ROOTLESS_USER" rpm -q \