[packit] 1.12 upstream release

Upstream tag: 1.12
Upstream commit: ce429cb2

.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -80,25 +80,3 @@ crun-0.1.1.tar.gz
 /crun-1.11.1.tar.xz
 /crun-1.11.2.tar.xz
 /crun-1.12.tar.xz
-/crun-1.13.tar.xz
-/crun-1.14.tar.xz
-/crun-1.14.1.tar.xz
-/crun-1.14.2.tar.xz
-/crun-1.14.3.tar.xz
-/crun-1.14.4.tar.xz
-/crun-1.15.tar.zst
-/crun-1.17.tar.zst
-/crun-1.18.tar.zst
-/crun-1.18.1.tar.zst
-/crun-1.18.2.tar.zst
-/crun-1.19.tar.zst
-/crun-1.19.1.tar.zst
-/crun-1.20.tar.zst
-/crun-1.21.tar.zst
-/crun-1.22.tar.zst
-/crun-1.23.tar.zst
-/crun-1.23.1.tar.zst
-/crun-1.24.tar.zst
-/crun-1.25.tar.zst
-/crun-1.25.1.tar.zst
-/crun-1.26.tar.zst

.packit.yaml

@@ -2,42 +2,12 @@
 # See the documentation for more information:
 # https://packit.dev/docs/configuration/
 
-downstream_package_name: crun
-
-# Ref: https://packit.dev/docs/configuration#files_to_sync
-files_to_sync:
-  - src: rpm/gating.yaml
-    dest: gating.yaml
-  - src: plans/
-    dest: plans/
-    delete: true
-    mkpath: true
-  - src: tests/tmt/
-    dest: tests/tmt/
-    delete: true
-    mkpath: true
-  - src: .fmf/
-    dest: .fmf/
-    delete: true
-    mkpath: true
-  - .packit.yaml
-
-packages:
-  crun-fedora:
-    pkg_tool: fedpkg
-    specfile_path: rpm/crun.spec
-  crun-centos:
-    pkg_tool: centpkg
-    specfile_path: rpm/crun.spec
-  crun-eln:
-    specfile_path: rpm/crun.spec
+specfile_path: rpm/crun.spec
 
 srpm_build_deps:
   - git-archive-all
   - make
-
 actions:
-  # This action runs only on copr build jobs
   create-archive:
     - "git-archive-all -v --force-submodules rpm/crun-HEAD.tar.xz"
     - bash -c "ls -1 rpm/crun-HEAD.tar.xz"
@@ -45,36 +15,24 @@ actions:
 jobs:
   - job: copr_build
     trigger: pull_request
-    packages: [crun-fedora]
-    notifications: &copr_build_failure_notification
+    notifications:
       failure_comment:
         message: "Ephemeral COPR build failed. @containers/packit-build please check."
-    targets: &fedora_copr_targets
+    targets:
       - fedora-all-x86_64
       - fedora-all-aarch64
-
-  - job: copr_build
-    trigger: pull_request
-    packages: [crun-eln]
-    notifications: *copr_build_failure_notification
-    targets:
       - fedora-eln-x86_64
       - fedora-eln-aarch64
-
-  - job: copr_build
-    trigger: pull_request
-    packages: [crun-centos]
-    notifications: *copr_build_failure_notification
-    targets: &centos_copr_targets
-      - centos-stream-9-x86_64
-      - centos-stream-9-aarch64
-      - centos-stream-10-x86_64
-      - centos-stream-10-aarch64
+      - centos-stream+epel-next-8-x86_64
+      - centos-stream+epel-next-8-aarch64
+      - centos-stream+epel-next-9-x86_64
+      - centos-stream+epel-next-9-aarch64
+    additional_repos:
+      - "copr://rhcontainerbot/podman-next"
 
   # Run on commit to main branch
   - job: copr_build
     trigger: commit
-    packages: [crun-fedora]
     notifications:
       failure_comment:
         message: "podman-next COPR build failed. @containers/packit-build please check."
@@ -82,59 +40,18 @@ jobs:
     owner: rhcontainerbot
     project: podman-next
 
-  # Podman system tests for Fedora and CentOS Stream
-  - job: tests
-    trigger: pull_request
-    packages: [crun-fedora]
-    notifications: &test_failure_notification
-      failure_comment:
-        message: "TMT tests failed. @containers/packit-build please check."
-    targets: *fedora_copr_targets
-    tf_extra_params:
-      environments:
-        - artifacts:
-          - type: repository-file
-            id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo
-
-  # Podman system tests for CentOS Stream
-  - job: tests
-    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
-    tf_extra_params:
-      environments:
-        - artifacts:
-          - type: repository-file
-            id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/centos-stream-$releasever/rhcontainerbot-podman-next-centos-stream-$releasever.repo
-
   - job: propose_downstream
     trigger: release
-    packages: [crun-fedora]
-    dist_git_branches: &fedora_targets
-      - fedora-all
-
-  # Disabled until we're switching to Packit for CentOS Stream
-  - job: propose_downstream
-    trigger: ignore
-    packages: [crun-centos]
+    update_release: false
     dist_git_branches:
-      - c10s
+      - fedora-all
 
   - job: koji_build
     trigger: commit
-    packages: [crun-fedora]
-    dist_git_branches: *fedora_targets
+    dist_git_branches:
+      - fedora-all
 
   - job: bodhi_update
     trigger: commit
-    packages: [crun-fedora]
     dist_git_branches:
       - fedora-branched # rawhide updates are created automatically

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 0.86.2.post1.dev2+g209847d1.

crun.spec

@@ -1,36 +1,34 @@
 %global krun_opts %{nil}
 %global wasmedge_opts %{nil}
-%global yajl_opts %{nil}
+%global wasmtime_opts %{nil}
 
-%if %{defined copr_username}
-%define copr_build 1
-%endif
-
-# krun and wasm support only on aarch64 and x86_64
+# krun and wasm[edge,time] support only on aarch64 and x86_64
 %ifarch aarch64 || x86_64
-
-%if %{defined fedora}
-# krun only exists on fedora
-%global krun_support 1
-%global krun_opts --with-libkrun
-
-# Keep wasmedge enabled only on Fedora. It breaks a lot on EPEL.
 %global wasm_support 1
+
+# wasmedge not present on Fedora ELN environments
+%if !0%{?eln}
 %global wasmedge_support 1
 %global wasmedge_opts --with-wasmedge
 %endif
 
+# krun only exists on fedora
+%if %{defined fedora}
+%global krun_support 1
+%global krun_opts --with-libkrun
+%endif
+
+# wasmtime exists only on podman-next copr for now
+%if %{defined copr_project} && "%{?copr_project}" == "podman-next"
+%global wasmtime_support 1
+%global wasmtime_opts --with-wasmtime
 %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}
+%if %{defined copr_username}
 Epoch: 102
 %endif
 # DO NOT TOUCH the Version string!
@@ -39,10 +37,10 @@ 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.12
 Release: %autorelease
 URL: https://github.com/containers/%{name}
-Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.zst
+Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz
 License: GPL-2.0-only
 %if %{defined golang_arches_future}
 ExclusiveArch: %{golang_arches_future}
@@ -59,9 +57,7 @@ BuildRequires: libcap-devel
 BuildRequires: libkrun-devel
 %endif
 BuildRequires: systemd-devel
-%if %{defined system_yajl}
 BuildRequires: yajl-devel
-%endif
 BuildRequires: libseccomp-devel
 BuildRequires: python3-libmount
 BuildRequires: libtool
@@ -72,8 +68,14 @@ Recommends: criu-libs
 %if %{defined wasmedge_support}
 BuildRequires: wasmedge-devel
 %endif
+%if %{defined wasmtime_support}
+BuildRequires: wasmtime-c-api-devel
+%endif
+%if %{defined rhel} && 0%{?rhel} == 8
+BuildRequires: python3
+%else
 BuildRequires: python
-BuildRequires: glibc-static
+%endif
 Provides: oci-runtime
 
 %description
@@ -94,11 +96,7 @@ krun is a symlink to the %{name} binary, with libkrun as an additional dependenc
 %package wasm
 Summary: %{name} with wasm support
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-# wasm packages are not present on RHEL yet and are currently a PITA to test
-# Best to only include wasmedge as weak dep on rhel
-%if %{defined fedora}
 Requires: wasm-library
-%endif
 Recommends: wasmedge
 
 %description wasm
@@ -110,15 +108,20 @@ Recommends: wasmedge
 
 %build
 ./autogen.sh
-./configure --disable-silent-rules %{krun_opts} %{wasmedge_opts} %{yajl_opts}
+./configure --disable-silent-rules %{krun_opts} %{wasmedge_opts} %{wasmtime_opts}
 %make_build
 
 %install
 %make_install prefix=%{_prefix}
 rm -rf %{buildroot}%{_prefix}/lib*
 
-# Placeholder check to silence rpmlint
-%check
+%if %{defined krun_support}
+ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/krun
+%endif
+
+%if %{defined wasm_support}
+ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-wasm
+%endif
 
 %files
 %license COPYING

gating.yaml

@@ -1,15 +0,0 @@
---- !Policy
-product_versions:
-  - fedora-*
-decision_contexts:
-  - bodhi_update_push_stable
-  - bodhi_update_push_testing
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
-
---- !Policy
-product_versions:
-  - rhel-*
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

plans/main.fmf

@@ -1,40 +0,0 @@
-discover:
-    how: fmf
-execute:
-    how: tmt
-prepare:
-    - when: distro == centos-stream or distro == rhel
-      how: shell
-      script: |
-        dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-$(rpm --eval '%{?rhel}').noarch.rpm
-        dnf -y config-manager --set-enabled epel
-      order: 10
-    - when: initiator == packit
-      how: shell
-      script: |
-        COPR_REPO_FILE="/etc/yum.repos.d/*podman-next*.repo"
-        if compgen -G $COPR_REPO_FILE > /dev/null; then
-            sed -i -n '/^priority=/!p;$apriority=1' $COPR_REPO_FILE
-        fi
-        dnf -y upgrade --allowerasing
-      order: 20
-    - how: install
-      package:
-        - bats
-        - crun
-        - podman-tests
-
-/shellcheck:
-    discover+:
-        filter: 'tag:shellcheck'
-    enabled: true
-    adjust:
-        enabled: false
-        when: distro == centos-stream-10 or distro == rhel-10
-    prepare+:
-        - how: install
-          package: ShellCheck
-
-/tests:
-    discover+:
-        filter: 'tag:podman | tag:sanity'

plans/tmt.fmf

@@ -1,9 +0,0 @@
-/:
-  inherit: false
-
-summary: Run tmt's integration tests
-plan:
-  import:
-    url: https://github.com/teemtee/tmt
-    path: /plans/friends
-    name: /podman

sources

@@ -1 +1 @@
-SHA512 (crun-1.26.tar.zst) = 0785af6095a26290f433c5739bea5d98a029c3f0e8efbeed420481849ebddd70acde6c1105133c392abf26bca90d232cced5e5994da7506d66a020a02c129fb3
+SHA512 (crun-1.12.tar.xz) = 3ed4d2c2b27ea1b9c0c68762e2eff0f18ee9efcd401a9f7fc984459f1b593def2a353484c8c0c5967fb2aae11df446aca4353346f843e3a0298d2400721ee488

tests/tmt/podman/system-test.fmf

@@ -1,7 +0,0 @@
-adjust:
-    duration: 10m
-    when: arch == aarch64
-
-summary: Run crun specific Podman tests
-test: bash ./system-test.sh
-tag: [ podman ]

tests/tmt/podman/system-test.sh

@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-set -exo pipefail
-
-if [[ "$(id -u)" -ne 0 ]];then
-    echo "Please run this script as superuser"
-    exit 1
-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

tests/tmt/sanity/config.json

@@ -1,180 +0,0 @@
-{
-	"ociVersion": "1.0.0",
-	"process": {
-		"terminal": false,
-		"user": {
-			"uid": 0,
-			"gid": 0
-		},
-		"args": [
-			"sleep", "10"
-		],
-		"env": [
-			"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
-			"TERM=xterm"
-		],
-		"cwd": "/",
-		"capabilities": {
-			"bounding": [
-				"CAP_AUDIT_WRITE",
-				"CAP_KILL",
-				"CAP_NET_BIND_SERVICE"
-			],
-			"effective": [
-				"CAP_AUDIT_WRITE",
-				"CAP_KILL",
-				"CAP_NET_BIND_SERVICE"
-			],
-			"inheritable": [
-			],
-			"permitted": [
-				"CAP_AUDIT_WRITE",
-				"CAP_KILL",
-				"CAP_NET_BIND_SERVICE"
-			],
-			"ambient": [
-				"CAP_AUDIT_WRITE",
-				"CAP_KILL",
-				"CAP_NET_BIND_SERVICE"
-			]
-		},
-		"rlimits": [
-			{
-				"type": "RLIMIT_NOFILE",
-				"hard": 1024,
-				"soft": 1024
-			}
-		],
-		"noNewPrivileges": true
-	},
-	"root": {
-		"path": "rootfs",
-		"readonly": true
-	},
-	"hostname": "crun",
-	"mounts": [
-		{
-			"destination": "/proc",
-			"type": "proc",
-			"source": "proc"
-		},
-		{
-			"destination": "/dev",
-			"type": "tmpfs",
-			"source": "tmpfs",
-			"options": [
-				"nosuid",
-				"strictatime",
-				"mode=755",
-				"size=65536k"
-			]
-		},
-		{
-			"destination": "/dev/pts",
-			"type": "devpts",
-			"source": "devpts",
-			"options": [
-				"nosuid",
-				"noexec",
-				"newinstance",
-				"ptmxmode=0666",
-				"mode=0620",
-				"gid=5"
-			]
-		},
-		{
-			"destination": "/dev/shm",
-			"type": "tmpfs",
-			"source": "shm",
-			"options": [
-				"nosuid",
-				"noexec",
-				"nodev",
-				"mode=1777",
-				"size=65536k"
-			]
-		},
-		{
-			"destination": "/dev/mqueue",
-			"type": "mqueue",
-			"source": "mqueue",
-			"options": [
-				"nosuid",
-				"noexec",
-				"nodev"
-			]
-		},
-		{
-			"destination": "/sys",
-			"type": "sysfs",
-			"source": "sysfs",
-			"options": [
-				"nosuid",
-				"noexec",
-				"nodev",
-				"ro"
-			]
-		},
-		{
-			"destination": "/sys/fs/cgroup",
-			"type": "cgroup",
-			"source": "cgroup",
-			"options": [
-				"nosuid",
-				"noexec",
-				"nodev",
-				"relatime",
-				"ro"
-			]
-		}
-	],
-	"linux": {
-		"resources": {
-			"devices": [
-				{
-					"allow": false,
-					"access": "rwm"
-				}
-			]
-		},
-		"namespaces": [
-			{
-				"type": "pid"
-			},
-			{
-				"type": "network"
-			},
-			{
-				"type": "ipc"
-			},
-			{
-				"type": "uts"
-			},
-			{
-				"type": "cgroup"
-			},
-			{
-				"type": "mount"
-			}
-		],
-		"maskedPaths": [
-			"/proc/acpi",
-			"/proc/asound",
-			"/proc/kcore",
-			"/proc/keys",
-			"/proc/latency_stats",
-			"/proc/timer_list",
-			"/proc/timer_stats",
-			"/proc/sched_debug",
-			"/sys/firmware",
-			"/proc/scsi"
-		],
-		"readonlyPaths": [
-			"/proc/bus",
-			"/proc/fs",
-			"/proc/irq",
-			"/proc/sys",
-			"/proc/sysrq-trigger"
-		]
-	}
-}

tests/tmt/sanity/main.fmf

@@ -1,4 +0,0 @@
-summary: Sanity test for crun
-test: bash ./runtest.sh
-duration: 10m
-tag: [ sanity ]

tests/tmt/sanity/runtest.sh

@@ -1,113 +0,0 @@
-#!/usr/bin/env bash
-
-set -exo pipefail
-
-TEMPDIR=$(mktemp -d)
-TESTIMG="quay.io/libpod/busybox"
-CNAME="mycont-$RANDOM"
-
-cat /etc/redhat-release
-uname -r
-rpm -q crun criu
-
-if ! crun --version; then
-    exit 1
-fi
-
-if ! crun features; then
-    exit 1
-fi
-
-if ! crun list; then
-    exit 1
-fi
-
-# create the top most bundle and rootfs directory
-mkdir -p "$TEMPDIR"/rootfs
-
-# export busybox via podman into the rootfs directory
-if ! (podman export "$(podman create $TESTIMG)" | tar -C "$TEMPDIR"/rootfs -xvf -); then
-    exit 1
-fi
-
-# use existing spec
-cp ./config.json "$TEMPDIR"
-ls "$TEMPDIR"
-cd "$TEMPDIR"
-
-if ! crun create $CNAME; then
-    exit 1
-fi
-
-if ! crun list; then
-    exit 1
-fi
-
-if ! crun start $CNAME; then
-    exit 1
-fi
-
-if ! crun list; then
-    exit 1
-fi
-
-if ! crun state $CNAME; then
-    exit 1
-fi
-
-if ! crun ps $CNAME; then
-    exit 1
-fi
-
-if ! ret=$(crun exec $CNAME pwd) || [[ "$ret" != '/' ]]; then
-    exit 1
-fi
-
-if ! crun pause $CNAME; then
-    exit 1
-fi
-
-if ! crun state $CNAME; then
-    exit 1
-fi
-
-if ! crun resume $CNAME; then
-    exit 1
-fi
-
-if ! crun state $CNAME; then
-    exit 1
-fi
-
-if ! ret=$(crun exec $CNAME pwd) || [[ "$ret" != '/' ]]; then
-    exit 1
-fi
-
-if ! crun delete --force $CNAME; then
-    exit 1
-fi
-
-if ! crun list; then
-    exit 1
-fi
-
-if ! (crun run $CNAME &); then
-    exit 1
-fi
-
-if ! crun list; then
-    exit 1
-fi
-
-# make sure the container is running state
-sleep 2
-
-if ! ret=$(crun exec $CNAME echo 'ok') || [[ "$ret" != 'ok' ]]; then
-    exit 1
-fi
-
-if ! crun kill $CNAME; then
-    exit 1
-fi
-
-exit 0

tests/tmt/shellcheck/main.fmf

@@ -1,4 +0,0 @@
-summary: Shellcheck tests
-test: find ../ -type f -name "*.sh" -exec shellcheck {} + 
-duration: 10m
-tag: [ shellcheck ]