From 3446799524661506bf74fe0dc34f226f93bc23aa Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Mon, 6 Sep 2021 09:45:11 +0100 Subject: [PATCH] Disable podman test when c/r is not supported Resolves: rhbz#2000882 Signed-off-by: Radostin Stoyanov --- criu.spec | 6 +++++- tests/run-podman-checkpoint-restore.sh | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/criu.spec b/criu.spec index 9e1afbc..a5aa580 100644 --- a/criu.spec +++ b/criu.spec @@ -11,7 +11,7 @@ Name: criu Version: 3.15 -Release: 11%{?dist} +Release: 12%{?dist} Provides: crtools = %{version}-%{release} Obsoletes: crtools <= 1.0-2 Summary: Tool for Checkpoint/Restore in User-space @@ -118,6 +118,10 @@ rm -rf $RPM_BUILD_ROOT%{_libexecdir}/%{name} %doc %{_mandir}/man1/crit.1* %changelog +* Mon Sep 6 2021 Radostin Stoyanov - 3.15-12 +- Increase release number from 11 to 12 +- Disable podman test when crun doesn't support checkpoint/restore + * Tue Aug 31 2021 Adrian Reber - 3.15-11 - Remove unnecessary Requires: criu-libs - Remove wrong BR nftables-devel diff --git a/tests/run-podman-checkpoint-restore.sh b/tests/run-podman-checkpoint-restore.sh index 845d0b4..b606d9b 100755 --- a/tests/run-podman-checkpoint-restore.sh +++ b/tests/run-podman-checkpoint-restore.sh @@ -4,6 +4,11 @@ set -eux ls -la +if ! crun checkpoint --help; then + echo "crun doesn't support checkpoint/restore" + exit 0 +fi + echo "Start container" podman --log-level debug run -d quay.io/adrianreber/counter