Update to 1.29.1 upstream release

Upstream tag: 1.29.1
Upstream commit: f0d911de

Commit authored by Packit automation (https://packit.dev/)

.gitignore

@@ -102,3 +102,8 @@ crun-0.1.1.tar.gz
 /crun-1.25.tar.zst
 /crun-1.25.1.tar.zst
 /crun-1.26.tar.zst
+/crun-1.27.tar.zst
+/crun-1.27.1.tar.zst
+/crun-1.28.tar.zst
+/crun-1.29.tar.zst
+/crun-1.29.1.tar.zst

.packit.yaml

@@ -101,14 +101,7 @@ jobs:
     trigger: pull_request
     packages: [crun-centos]
     notifications: *test_failure_notification
-    # TODO: Re-enable centos-stream-10-x86_64 once criu issues are solved
-    # Ref: https://github.com/containers/crun/pull/1758#issuecomment-2901772392
-    # Issue filed: https://github.com/containers/crun/issues/1759
-    #targets: *centos_copr_targets
-    targets:
-      - centos-stream-9-x86_64
-      - centos-stream-9-aarch64
-      - centos-stream-10-aarch64
+    targets: *centos_copr_targets
     tf_extra_params:
       environments:
         - artifacts:

README.packit

@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 1.13.0.post1.dev2+g84134016c.
+The file was generated using packit 1.16.2.post1.dev8+g69d783e81.

crun.spec

@@ -1,6 +1,6 @@
 %global krun_opts %{nil}
 %global wasmedge_opts %{nil}
-%global yajl_opts %{nil}
+%global blake3_opts --enable-embedded-blake3
 
 %if %{defined copr_username}
 %define copr_build 1
@@ -22,12 +22,6 @@
 
 %endif
 
-%if %{defined fedora} || (%{defined rhel} && 0%{?rhel} < 10)
-%global system_yajl 1
-%else
-%global yajl_opts --enable-embedded-yajl
-%endif
-
 Summary: OCI runtime written in C
 Name: crun
 %if %{defined copr_build}
@@ -39,7 +33,7 @@ Epoch: 102
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.26
+Version: 1.29.1
 Release: %autorelease
 URL: https://github.com/containers/%{name}
 Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.zst
@@ -59,9 +53,7 @@ BuildRequires: libcap-devel
 BuildRequires: libkrun-devel
 %endif
 BuildRequires: systemd-devel
-%if %{defined system_yajl}
-BuildRequires: yajl-devel
-%endif
+BuildRequires: json-c-devel
 BuildRequires: libseccomp-devel
 BuildRequires: python3-libmount
 BuildRequires: libtool
@@ -110,7 +102,7 @@ Recommends: wasmedge
 
 %build
 ./autogen.sh
-./configure --disable-silent-rules %{krun_opts} %{wasmedge_opts} %{yajl_opts}
+./configure --disable-silent-rules %{krun_opts} %{wasmedge_opts} %{blake3_opts}
 %make_build
 
 %install

plans/main.fmf

@@ -18,6 +18,14 @@ prepare:
         fi
         dnf -y upgrade --allowerasing
       order: 20
+
+    # TODO: Remove once https://issues.redhat.com/browse/RHEL-153064 is fixed.
+    - when: distro == centos-stream-9
+      how: install
+      package:
+        - iptables-legacy
+      order: 30
+
     - how: install
       package:
         - bats

sources

@@ -1 +1 @@
-SHA512 (crun-1.26.tar.zst) = 0785af6095a26290f433c5739bea5d98a029c3f0e8efbeed420481849ebddd70acde6c1105133c392abf26bca90d232cced5e5994da7506d66a020a02c129fb3
+SHA512 (crun-1.29.1.tar.zst) = d12ff1252b20fe8ac1015c7581fde3eabbefca396b8cd9c7fac94eb12606e7ace0c8f561651fa9983a7ae98ba1489c72da6d6aa563061faf1b274d5075ac22bd

tests/tmt/podman/system-test.fmf

@@ -1,7 +1,22 @@
-adjust:
-    duration: 10m
-    when: arch == aarch64
-
-summary: Run crun specific Podman tests
-test: bash ./system-test.sh
+summary: Run Podman system tests with crun
 tag: [ podman ]
+duration: 10m
+
+environment:
+    ROOTLESS_USER: testuser
+
+adjust:
+    - enabled: false
+      when: distro == centos-stream or distro == rhel
+    - duration: 15m
+      when: arch == aarch64
+
+/root:
+    tag+: [ root ]
+    summary: Run Podman system tests as root
+    test: bash ./system-test.sh
+
+/rootless:
+    tag+: [ rootless ]
+    summary: Run Podman system tests as rootless
+    test: bash ./system-test.sh rootless

tests/tmt/podman/system-test.sh

@@ -2,7 +2,7 @@
 
 set -exo pipefail
 
-if [[ "$(id -u)" -ne 0 ]];then
+if [[ "$(id -u)" -ne 0 ]]; then
     echo "Please run this script as superuser"
     exit 1
 fi
@@ -10,8 +10,34 @@ fi
 cat /etc/redhat-release
 rpm -q conmon containers-common crun podman podman-tests
 
-# Run crun specific podman tests
-bats -t /usr/share/podman/test/system/030-run.bats
-bats -t /usr/share/podman/test/system/075-exec.bats
-bats -t /usr/share/podman/test/system/280-update.bats
-bats -t /usr/share/podman/test/system/520-checkpoint.bats
+ROOTLESS_USER=${ROOTLESS_USER:-testuser}
+
+TESTS=(
+/usr/share/podman/test/system/030-run.bats
+/usr/share/podman/test/system/060-mount.bats
+/usr/share/podman/test/system/075-exec.bats
+/usr/share/podman/test/system/170-run-userns.bats
+/usr/share/podman/test/system/200-pod.bats
+/usr/share/podman/test/system/280-update.bats
+/usr/share/podman/test/system/400-unprivileged-access.bats
+/usr/share/podman/test/system/420-cgroups.bats
+/usr/share/podman/test/system/520-checkpoint.bats
+)
+
+# Filter out test files that do not exist in the installed version.
+existing_tests=()
+for t in "${TESTS[@]}"; do
+    if [[ -f $t ]]; then
+        existing_tests+=("$t")
+    fi
+done
+
+if [[ -z $1 ]]; then
+    bats -t "${existing_tests[@]}"
+elif [[ $1 == "rootless" ]]; then
+    if ! id "$ROOTLESS_USER" &>/dev/null; then
+        useradd "$ROOTLESS_USER"
+    fi
+    loginctl enable-linger "$ROOTLESS_USER"
+    su - "$ROOTLESS_USER" -c "bats -t ${existing_tests[*]}"
+fi