From 6733bdad08f7eef126fbe911bdefc0f6402af8b1 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:43:17 +0200 Subject: [PATCH 01/14] Rebuilt for Python 3.14.0rc2 bytecode --- criu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/criu.spec b/criu.spec index b310da5..ab468c5 100644 --- a/criu.spec +++ b/criu.spec @@ -12,7 +12,7 @@ Name: criu Version: 4.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for Checkpoint/Restore in User-space License: GPL-2.0-only AND LGPL-2.1-only AND MIT URL: http://criu.org/ @@ -188,6 +188,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libcriu.a %tmpfiles_create %{name}.conf %changelog +* Fri Aug 15 2025 Python Maint - 4.1.1-2 +- Rebuilt for Python 3.14.0rc2 bytecode + * Wed Jul 30 2025 Adrian Reber - 4.1.1-1 - Update to 4.1.1 From 678054d8fd9c4280fd093eccd46e2c7c7a7446c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 29 Jul 2025 23:04:08 +0200 Subject: [PATCH 02/14] Drop unused BuildRequires on python3-wheel See https://github.com/fedora-eln/eln/issues/284 --- criu.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/criu.spec b/criu.spec index ab468c5..98e755c 100644 --- a/criu.spec +++ b/criu.spec @@ -12,7 +12,7 @@ Name: criu Version: 4.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for Checkpoint/Restore in User-space License: GPL-2.0-only AND LGPL-2.1-only AND MIT URL: http://criu.org/ @@ -33,7 +33,7 @@ BuildRequires: libnet-devel BuildRequires: protobuf-devel protobuf-c-devel %{py_prefix}-devel libnl3-devel libcap-devel BuildRequires: %{py_prefix}-pip BuildRequires: %{py_prefix}-setuptools -BuildRequires: %{py_prefix}-wheel +BuildRequires: (%{py_prefix}-wheel if %{py_prefix}-setuptools < 71) BuildRequires: %{py_prefix}-protobuf BuildRequires: asciidoctor BuildRequires: perl-interpreter @@ -188,6 +188,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libcriu.a %tmpfiles_create %{name}.conf %changelog +* Wed Aug 27 2025 Miro Hrončok - 4.1.1-3 +- Drop unused BuildRequires on python3-wheel + * Fri Aug 15 2025 Python Maint - 4.1.1-2 - Rebuilt for Python 3.14.0rc2 bytecode From ad9dc1a142fcde0ce8cec66ce2432820c5965f69 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:12:32 +0200 Subject: [PATCH 03/14] Rebuilt for Python 3.14.0rc3 bytecode --- criu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/criu.spec b/criu.spec index 98e755c..a40fa5c 100644 --- a/criu.spec +++ b/criu.spec @@ -12,7 +12,7 @@ Name: criu Version: 4.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool for Checkpoint/Restore in User-space License: GPL-2.0-only AND LGPL-2.1-only AND MIT URL: http://criu.org/ @@ -188,6 +188,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libcriu.a %tmpfiles_create %{name}.conf %changelog +* Fri Sep 19 2025 Python Maint - 4.1.1-4 +- Rebuilt for Python 3.14.0rc3 bytecode + * Wed Aug 27 2025 Miro Hrončok - 4.1.1-3 - Drop unused BuildRequires on python3-wheel From 5467ca58cd232a1f2cebcc28bd0da60f2386685d Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 17 Nov 2025 02:45:34 +0100 Subject: [PATCH 04/14] Update to 4.2 Signed-off-by: Adrian Reber --- .gitignore | 1 + 2653.patch | 134 ----------------------------------------------------- criu.spec | 10 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 140 deletions(-) delete mode 100644 2653.patch diff --git a/.gitignore b/.gitignore index 5e0f8c8..e5c1b1b 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ /criu-4.0.tar.gz /criu-4.1.tar.gz /criu-4.1.1.tar.gz +/criu-4.2.tar.gz diff --git a/2653.patch b/2653.patch deleted file mode 100644 index bcb96fd..0000000 --- a/2653.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 22fdffbdde9476b27988b3ee0a4013a4453784c9 Mon Sep 17 00:00:00 2001 -From: Andrei Vagin -Date: Mon, 21 Apr 2025 06:33:41 +0000 -Subject: [PATCH] net: nftables: avoid restore failure if the CRIU nft table - already exist - -CRIU locks the network during restore in an "empty" network namespace. -However, "empty" in this context means CRIU isn't restoring the -namespace. This network namespace can be the same namespace where -processes have been dumped and so the network is already locked in it. - -Fixes #2650 - -Signed-off-by: Andrei Vagin ---- - criu/cr-restore.c | 2 +- - criu/include/net.h | 2 +- - criu/net.c | 30 +++++++++++++++++------------- - 3 files changed, 19 insertions(+), 15 deletions(-) - -diff --git a/criu/cr-restore.c b/criu/cr-restore.c -index 583b446e0b..30932f60a2 100644 ---- a/criu/cr-restore.c -+++ b/criu/cr-restore.c -@@ -2119,7 +2119,7 @@ static int restore_root_task(struct pstree_item *init) - * the '--empty-ns net' mode no iptables C/R is done and we - * need to return these rules by hands. - */ -- ret = network_lock_internal(); -+ ret = network_lock_internal(/* restore = */ true); - if (ret) - goto out_kill; - } -diff --git a/criu/include/net.h b/criu/include/net.h -index 5e8a848620..7c5ede21e1 100644 ---- a/criu/include/net.h -+++ b/criu/include/net.h -@@ -31,7 +31,7 @@ extern int collect_net_namespaces(bool for_dump); - - extern int network_lock(void); - extern void network_unlock(void); --extern int network_lock_internal(void); -+extern int network_lock_internal(bool restore); - - extern struct ns_desc net_ns_desc; - -diff --git a/criu/net.c b/criu/net.c -index ee46f1c495..300df480b0 100644 ---- a/criu/net.c -+++ b/criu/net.c -@@ -3206,12 +3206,12 @@ static inline FILE *redirect_nftables_output(struct nft_ctx *nft) - } - #endif - --static inline int nftables_lock_network_internal(void) -+static inline int nftables_lock_network_internal(bool restore) - { - #if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1) - cleanup_file FILE *fp = NULL; - struct nft_ctx *nft; -- int ret = 0; -+ int ret = 0, exit_code = -1; - char table[32]; - char buf[128]; - -@@ -3224,11 +3224,16 @@ static inline int nftables_lock_network_internal(void) - - fp = redirect_nftables_output(nft); - if (!fp) -- goto out; -+ goto err2; - - snprintf(buf, sizeof(buf), "create table %s", table); -- if (NFT_RUN_CMD(nft, buf)) -+ ret = NFT_RUN_CMD(nft, buf); -+ if (ret) { -+ /* The network has been locked on dump. */ -+ if (restore && errno == EEXIST) -+ return 0; - goto err2; -+ } - - snprintf(buf, sizeof(buf), "add chain %s output { type filter hook output priority 0; policy drop; }", table); - if (NFT_RUN_CMD(nft, buf)) -@@ -3246,17 +3251,16 @@ static inline int nftables_lock_network_internal(void) - if (NFT_RUN_CMD(nft, buf)) - goto err1; - -- goto out; -- -+ exit_code = 0; -+out: -+ nft_ctx_free(nft); -+ return exit_code; - err1: - snprintf(buf, sizeof(buf), "delete table %s", table); - NFT_RUN_CMD(nft, buf); - err2: -- ret = -1; - pr_err("Locking network failed using nftables\n"); --out: -- nft_ctx_free(nft); -- return ret; -+ goto out; - #else - pr_err("CRIU was built without libnftables support\n"); - return -1; -@@ -3288,7 +3292,7 @@ static int iptables_network_lock_internal(void) - return ret; - } - --int network_lock_internal(void) -+int network_lock_internal(bool restore) - { - int ret = 0, nsret; - -@@ -3301,7 +3305,7 @@ int network_lock_internal(void) - if (opts.network_lock_method == NETWORK_LOCK_IPTABLES) - ret = iptables_network_lock_internal(); - else if (opts.network_lock_method == NETWORK_LOCK_NFTABLES) -- ret = nftables_lock_network_internal(); -+ ret = nftables_lock_network_internal(restore); - - if (restore_ns(nsret, &net_ns_desc)) - ret = -1; -@@ -3427,7 +3431,7 @@ int network_lock(void) - if (run_scripts(ACT_NET_LOCK)) - return -1; - -- return network_lock_internal(); -+ return network_lock_internal(false); - } - - void network_unlock(void) diff --git a/criu.spec b/criu.spec index a40fa5c..c20cbea 100644 --- a/criu.spec +++ b/criu.spec @@ -11,15 +11,13 @@ %undefine _auto_set_build_flags Name: criu -Version: 4.1.1 -Release: 4%{?dist} +Version: 4.2 +Release: 1%{?dist} Summary: Tool for Checkpoint/Restore in User-space License: GPL-2.0-only AND LGPL-2.1-only AND MIT URL: http://criu.org/ Source0: https://github.com/checkpoint-restore/criu/archive/v%{version}/criu-%{version}.tar.gz -Patch0: https://github.com/checkpoint-restore/criu/pull/2653.patch - # Add protobuf-c as a dependency. # We use this patch because the protobuf-c package name # in RPM and DEB is different. @@ -115,7 +113,6 @@ This script can help to workaround the so called "PID mismatch" problem. %prep %setup -q -%patch -P 0 -p1 %patch -P 99 -p1 %build @@ -188,6 +185,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libcriu.a %tmpfiles_create %{name}.conf %changelog +* Mon Nov 17 2025 Adrian Reber - 4.2 +- Update to 4.2 + * Fri Sep 19 2025 Python Maint - 4.1.1-4 - Rebuilt for Python 3.14.0rc3 bytecode diff --git a/sources b/sources index f653226..8f69f50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (criu-4.1.1.tar.gz) = a73c35dbd4ec4d2ead0799c6f1af2f467610c538c3ab4a87f5586aa1d29a8268bbc6c222bb3026a32211b6899a4d39730d61fa453ce2adafa561d92f6c87e228 +SHA512 (criu-4.2.tar.gz) = f7e0ac17d46dd560bb2439f617a0a3b3933eb86f4b8b9b16852d300e4ffc6a4851d72be9342dfd40792a53fca8b65d26fde4e1b1f02bcd04923a8b6f0e5c8a62 From b18123941d500c38b9d94a3e550f33fb67a53f1c Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 17 Nov 2025 10:47:51 +0000 Subject: [PATCH 05/14] Update to 4.2 Signed-off-by: Adrian Reber --- criu.spec | 4 ++-- rpminspect.yaml | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 rpminspect.yaml diff --git a/criu.spec b/criu.spec index c20cbea..d67955f 100644 --- a/criu.spec +++ b/criu.spec @@ -12,7 +12,7 @@ Name: criu Version: 4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for Checkpoint/Restore in User-space License: GPL-2.0-only AND LGPL-2.1-only AND MIT URL: http://criu.org/ @@ -185,7 +185,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libcriu.a %tmpfiles_create %{name}.conf %changelog -* Mon Nov 17 2025 Adrian Reber - 4.2 +* Mon Nov 17 2025 Adrian Reber - 4.2-2 - Update to 4.2 * Fri Sep 19 2025 Python Maint - 4.1.1-4 diff --git a/rpminspect.yaml b/rpminspect.yaml new file mode 100644 index 0000000..6b8f937 --- /dev/null +++ b/rpminspect.yaml @@ -0,0 +1,4 @@ +--- +annocheck: + jobs: + - hardened: --verbose --skip-dynamic-tags --skip-property-note --skip-bind-now --skip-pie --skip-cf-protection From c4e321b1d78897969078602af077abbbb8327420 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 17 Nov 2025 14:50:33 +0100 Subject: [PATCH 06/14] Update to 4.2 Signed-off-by: Adrian Reber --- criu.spec | 4 ++-- rpminspect.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/criu.spec b/criu.spec index d67955f..20dbedb 100644 --- a/criu.spec +++ b/criu.spec @@ -12,7 +12,7 @@ Name: criu Version: 4.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for Checkpoint/Restore in User-space License: GPL-2.0-only AND LGPL-2.1-only AND MIT URL: http://criu.org/ @@ -185,7 +185,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libcriu.a %tmpfiles_create %{name}.conf %changelog -* Mon Nov 17 2025 Adrian Reber - 4.2-2 +* Mon Nov 17 2025 Adrian Reber - 4.2-3 - Update to 4.2 * Fri Sep 19 2025 Python Maint - 4.1.1-4 diff --git a/rpminspect.yaml b/rpminspect.yaml index 6b8f937..56018c6 100644 --- a/rpminspect.yaml +++ b/rpminspect.yaml @@ -1,4 +1,4 @@ --- annocheck: jobs: - - hardened: --verbose --skip-dynamic-tags --skip-property-note --skip-bind-now --skip-pie --skip-cf-protection + - hardened: --verbose --skip-dynamic-tags --skip-property-note --skip-bind-now --skip-pie --skip-cf-protection --skip-notes From 0f4173bc94b03dcc3818ebf16308b1be3cf652b6 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 17 Nov 2025 17:37:41 +0100 Subject: [PATCH 07/14] Update to 4.2 Signed-off-by: Adrian Reber --- criu.spec | 4 ++-- rpminspect.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/criu.spec b/criu.spec index 20dbedb..9b80e5c 100644 --- a/criu.spec +++ b/criu.spec @@ -12,7 +12,7 @@ Name: criu Version: 4.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool for Checkpoint/Restore in User-space License: GPL-2.0-only AND LGPL-2.1-only AND MIT URL: http://criu.org/ @@ -185,7 +185,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libcriu.a %tmpfiles_create %{name}.conf %changelog -* Mon Nov 17 2025 Adrian Reber - 4.2-3 +* Mon Nov 17 2025 Adrian Reber - 4.2-4 - Update to 4.2 * Fri Sep 19 2025 Python Maint - 4.1.1-4 diff --git a/rpminspect.yaml b/rpminspect.yaml index 56018c6..3430463 100644 --- a/rpminspect.yaml +++ b/rpminspect.yaml @@ -1,4 +1,4 @@ --- annocheck: jobs: - - hardened: --verbose --skip-dynamic-tags --skip-property-note --skip-bind-now --skip-pie --skip-cf-protection --skip-notes + - hardened: --verbose --skip-dynamic-tags --skip-property-note --skip-bind-now --skip-pie --skip-cf-protection --skip-notes --skip-gaps From 368f367e6924e842f6d426eaefdc274b463b15a5 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 17 Nov 2025 18:29:29 +0100 Subject: [PATCH 08/14] Update to 4.2 Signed-off-by: Adrian Reber --- criu.spec | 4 ++-- rpminspect.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/criu.spec b/criu.spec index 9b80e5c..ba4379c 100644 --- a/criu.spec +++ b/criu.spec @@ -12,7 +12,7 @@ Name: criu Version: 4.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tool for Checkpoint/Restore in User-space License: GPL-2.0-only AND LGPL-2.1-only AND MIT URL: http://criu.org/ @@ -185,7 +185,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libcriu.a %tmpfiles_create %{name}.conf %changelog -* Mon Nov 17 2025 Adrian Reber - 4.2-4 +* Mon Nov 17 2025 Adrian Reber - 4.2-5 - Update to 4.2 * Fri Sep 19 2025 Python Maint - 4.1.1-4 diff --git a/rpminspect.yaml b/rpminspect.yaml index 3430463..93f2777 100644 --- a/rpminspect.yaml +++ b/rpminspect.yaml @@ -1,4 +1,4 @@ --- annocheck: jobs: - - hardened: --verbose --skip-dynamic-tags --skip-property-note --skip-bind-now --skip-pie --skip-cf-protection --skip-notes --skip-gaps + - hardened: --verbose --skip-dynamic-tags --skip-property-note --skip-bind-now --skip-pie --skip-cf-protection --skip-notes --skip-gaps --skip-optimization --skip-stack-clash --skip-stack-prot From 13061f0076c966f6893e2bb283ffd68b9d3b8d78 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 17 Nov 2025 21:14:44 +0100 Subject: [PATCH 09/14] Convert STI tests to TMT (rhbz#2382879) Signed-off-by: Adrian Reber --- .fmf/version | 1 + criu.spec | 5 ++++- plans.fmf | 24 ++++++++++++++++++++++++ tests/{tests.yml => main.fmf} | 33 +++++++++++++-------------------- tests/run-zdtm.sh | 2 +- 5 files changed, 43 insertions(+), 22 deletions(-) create mode 100644 .fmf/version create mode 100644 plans.fmf rename tests/{tests.yml => main.fmf} (54%) diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/criu.spec b/criu.spec index ba4379c..ed21c01 100644 --- a/criu.spec +++ b/criu.spec @@ -12,7 +12,7 @@ Name: criu Version: 4.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Tool for Checkpoint/Restore in User-space License: GPL-2.0-only AND LGPL-2.1-only AND MIT URL: http://criu.org/ @@ -185,6 +185,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libcriu.a %tmpfiles_create %{name}.conf %changelog +* Mon Nov 15 2025 Cristian Le - 4.2-6 +- Convert STI tests to TMT (rhbz#2382879) + * Mon Nov 17 2025 Adrian Reber - 4.2-5 - Update to 4.2 diff --git a/plans.fmf b/plans.fmf new file mode 100644 index 0000000..52b1751 --- /dev/null +++ b/plans.fmf @@ -0,0 +1,24 @@ +summary: Run all tests +discover: + how: fmf +prepare: + - name: Disable installing everything from srpm + how: install + exclude: ".*" + - name: Install the main package + how: install + package: + - criu +execute: + how: tmt + +/zdtm: + # Use the srpm sources + discover+: + dist-git-source: true + dist-git-merge: true + test: /tests/zdtm + +/podman: + discover+: + test: /tests/podman diff --git a/tests/tests.yml b/tests/main.fmf similarity index 54% rename from tests/tests.yml rename to tests/main.fmf index 995fd2d..2062bee 100644 --- a/tests/tests.yml +++ b/tests/main.fmf @@ -1,16 +1,7 @@ ---- -- hosts: localhost - roles: - - role: standard-test-source - tags: - - classic - - role: standard-test-basic - tags: - - classic - required_packages: - - podman - - curl - - jq +/zdtm: + summary: Test zdtm + test: ./run-zdtm.sh + require: - checkpolicy - policycoreutils - make @@ -28,10 +19,12 @@ - python3-pyyaml - python3-protobuf - python-unversioned-command - tests: - - zdtm: - dir: . - run: ./run-zdtm.sh - - podman: - dir: . - run: ./run-podman-checkpoint-restore.sh + - crit + - python3-criu +/podman: + summary: Test podman + test: ./run-podman-checkpoint-restore.sh + require: + - podman + - curl + - jq diff --git a/tests/run-zdtm.sh b/tests/run-zdtm.sh index 460d090..f825928 100755 --- a/tests/run-zdtm.sh +++ b/tests/run-zdtm.sh @@ -36,7 +36,7 @@ RESULT=42 # this socket brakes CRIU's test cases rm -f /var/lib/sss/pipes/nss -cd "source/criu-$(crit --version)/" +cd ../criu-$(crit --version) echo "Build CRIU" make -j"$(nproc)" From ac36de486b2b2514e6fe69a1a0981fdd408590e5 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 17 Nov 2025 20:33:12 +0000 Subject: [PATCH 10/14] Test debugging Signed-off-by: Adrian Reber --- criu.spec | 4 ++-- tests/main.fmf | 1 + tests/run-podman-checkpoint-restore.sh | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/criu.spec b/criu.spec index ed21c01..6e042fb 100644 --- a/criu.spec +++ b/criu.spec @@ -12,7 +12,7 @@ Name: criu Version: 4.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Tool for Checkpoint/Restore in User-space License: GPL-2.0-only AND LGPL-2.1-only AND MIT URL: http://criu.org/ @@ -185,7 +185,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libcriu.a %tmpfiles_create %{name}.conf %changelog -* Mon Nov 15 2025 Cristian Le - 4.2-6 +* Mon Nov 15 2025 Cristian Le - 4.2-7 - Convert STI tests to TMT (rhbz#2382879) * Mon Nov 17 2025 Adrian Reber - 4.2-5 diff --git a/tests/main.fmf b/tests/main.fmf index 2062bee..221ef70 100644 --- a/tests/main.fmf +++ b/tests/main.fmf @@ -15,6 +15,7 @@ - libnl3-devel - libcap-devel - libaio-devel + - libuuid-devel - nftables-devel - python3-pyyaml - python3-protobuf diff --git a/tests/run-podman-checkpoint-restore.sh b/tests/run-podman-checkpoint-restore.sh index 845d0b4..0d846ae 100755 --- a/tests/run-podman-checkpoint-restore.sh +++ b/tests/run-podman-checkpoint-restore.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -eux +set -ux ls -la @@ -16,6 +16,8 @@ curl `podman inspect -l | jq -r '.[0].NetworkSettings.IPAddress'`:8088 echo "Checkpoint container" podman --log-level debug container checkpoint -l +cat /var/lib/containers/storage/overlay-containers/*/userdata/dump.log + podman ps -a echo "Restore container" podman --log-level debug container restore -l From 841fd2c85a9af34e6c80b03ae6de322ea6474d62 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 17 Nov 2025 21:35:38 +0100 Subject: [PATCH 11/14] Fix changelog date Signed-off-by: Adrian Reber --- criu.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/criu.spec b/criu.spec index 6e042fb..34e04d6 100644 --- a/criu.spec +++ b/criu.spec @@ -12,7 +12,7 @@ Name: criu Version: 4.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Tool for Checkpoint/Restore in User-space License: GPL-2.0-only AND LGPL-2.1-only AND MIT URL: http://criu.org/ @@ -185,7 +185,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libcriu.a %tmpfiles_create %{name}.conf %changelog -* Mon Nov 15 2025 Cristian Le - 4.2-7 +* Mon Nov 17 2025 Cristian Le - 4.2-8 - Convert STI tests to TMT (rhbz#2382879) * Mon Nov 17 2025 Adrian Reber - 4.2-5 From 1b9075566654f51a6e920af7a66bee2df519dbdc Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 17 Nov 2025 22:23:34 +0100 Subject: [PATCH 12/14] Increase test duration to 30 minutes From the default 5 minutes Signed-off-by: Adrian Reber --- criu.spec | 4 ++-- tests/main.fmf | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/criu.spec b/criu.spec index 34e04d6..fd4208f 100644 --- a/criu.spec +++ b/criu.spec @@ -12,7 +12,7 @@ Name: criu Version: 4.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Tool for Checkpoint/Restore in User-space License: GPL-2.0-only AND LGPL-2.1-only AND MIT URL: http://criu.org/ @@ -185,7 +185,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libcriu.a %tmpfiles_create %{name}.conf %changelog -* Mon Nov 17 2025 Cristian Le - 4.2-8 +* Mon Nov 17 2025 Cristian Le - 4.2-9 - Convert STI tests to TMT (rhbz#2382879) * Mon Nov 17 2025 Adrian Reber - 4.2-5 diff --git a/tests/main.fmf b/tests/main.fmf index 221ef70..a743210 100644 --- a/tests/main.fmf +++ b/tests/main.fmf @@ -1,6 +1,7 @@ /zdtm: summary: Test zdtm test: ./run-zdtm.sh + duration: 30m require: - checkpolicy - policycoreutils From 737146110baffdc47cc4b5202119d078d3e6ec5d Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 17 Nov 2025 22:56:10 +0100 Subject: [PATCH 13/14] Drop "Disable installing everything from srpm" This should fix that the newly build criu RPM is not installed in the test environment. Signed-off-by: Adrian Reber --- criu.spec | 4 ++-- plans.fmf | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/criu.spec b/criu.spec index fd4208f..32bf7a8 100644 --- a/criu.spec +++ b/criu.spec @@ -12,7 +12,7 @@ Name: criu Version: 4.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Tool for Checkpoint/Restore in User-space License: GPL-2.0-only AND LGPL-2.1-only AND MIT URL: http://criu.org/ @@ -185,7 +185,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libcriu.a %tmpfiles_create %{name}.conf %changelog -* Mon Nov 17 2025 Cristian Le - 4.2-9 +* Mon Nov 17 2025 Cristian Le - 4.2-10 - Convert STI tests to TMT (rhbz#2382879) * Mon Nov 17 2025 Adrian Reber - 4.2-5 diff --git a/plans.fmf b/plans.fmf index 52b1751..946731e 100644 --- a/plans.fmf +++ b/plans.fmf @@ -2,9 +2,6 @@ summary: Run all tests discover: how: fmf prepare: - - name: Disable installing everything from srpm - how: install - exclude: ".*" - name: Install the main package how: install package: From a0a8f6a514976e539722aeb20d6c263686bebfed Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 17 Nov 2025 23:41:29 +0100 Subject: [PATCH 14/14] Hopefully finally changes to make the tests work Signed-off-by: Adrian Reber --- criu.spec | 4 ++-- tests/run-podman-checkpoint-restore.sh | 7 ++++--- tests/run-zdtm.sh | 17 ++++++++++++++++- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/criu.spec b/criu.spec index 32bf7a8..ec8bb31 100644 --- a/criu.spec +++ b/criu.spec @@ -12,7 +12,7 @@ Name: criu Version: 4.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Tool for Checkpoint/Restore in User-space License: GPL-2.0-only AND LGPL-2.1-only AND MIT URL: http://criu.org/ @@ -185,7 +185,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libcriu.a %tmpfiles_create %{name}.conf %changelog -* Mon Nov 17 2025 Cristian Le - 4.2-10 +* Mon Nov 17 2025 Cristian Le - 4.2-11 - Convert STI tests to TMT (rhbz#2382879) * Mon Nov 17 2025 Adrian Reber - 4.2-5 diff --git a/tests/run-podman-checkpoint-restore.sh b/tests/run-podman-checkpoint-restore.sh index 0d846ae..6ed7ad6 100755 --- a/tests/run-podman-checkpoint-restore.sh +++ b/tests/run-podman-checkpoint-restore.sh @@ -1,8 +1,11 @@ #!/bin/bash -set -ux +set -eux ls -la +uname -a +rpm -qi criu || true +criu --version echo "Start container" podman --log-level debug run -d quay.io/adrianreber/counter @@ -16,8 +19,6 @@ curl `podman inspect -l | jq -r '.[0].NetworkSettings.IPAddress'`:8088 echo "Checkpoint container" podman --log-level debug container checkpoint -l -cat /var/lib/containers/storage/overlay-containers/*/userdata/dump.log - podman ps -a echo "Restore container" podman --log-level debug container restore -l diff --git a/tests/run-zdtm.sh b/tests/run-zdtm.sh index f825928..ab046e1 100755 --- a/tests/run-zdtm.sh +++ b/tests/run-zdtm.sh @@ -3,6 +3,8 @@ set -xe uname -a +rpm -qi criu || true +criu --version # These zdtm tests are skipped because they fail only in CI system EXCLUDES=" \ @@ -13,6 +15,19 @@ EXCLUDES=" \ -x zdtm/static/socket-tcp4v6-closed \ -x zdtm/static/maps01 \ -x zdtm/static/maps04 \ + -x zdtm/static/del_standalone_un \ + -x zdtm/static/del_standalone_un_seqpacket \ + -x zdtm/static/deleted_unix_sock \ + -x zdtm/static/fifo_upon_unix_socket00 \ + -x zdtm/static/sk-unix-dgram-ghost \ + -x zdtm/static/sk-unix01 \ + -x zdtm/static/sk-unix01-seqpacket \ + -x zdtm/static/socket-tcpbuf \ + -x zdtm/static/socket-tcpbuf6 \ + -x zdtm/static/sockets00 \ + -x zdtm/static/sockets00-seqpacket \ + -x zdtm/static/sockets03 \ + -x zdtm/static/sockets03-seqpacket \ -x zdtm/static/cgroup04 \ -x zdtm/static/cgroup_ifpriomap \ -x zdtm/static/netns_sub \ @@ -33,7 +48,7 @@ run_test() { RESULT=42 -# this socket brakes CRIU's test cases +# this socket breaks CRIU's test cases rm -f /var/lib/sss/pipes/nss cd ../criu-$(crit --version)