Update to 2.2.1 upstream release

Upstream tag: v2.2.1
Upstream commit: c8cc2c4d

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

.fmf/version

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

.gitignore

@@ -1 +1 @@
-/*.tar.gz
+/*.tar.*

.packit.yaml

@@ -0,0 +1,89 @@
+---
+# See the documentation for more information:
+# https://packit.dev/docs/configuration/
+
+downstream_package_name: conmon
+upstream_tag_template: v{version}
+
+packages:
+  conmon-fedora:
+    pkg_tool: fedpkg
+    specfile_path: rpm/conmon.spec
+  conmon-centos:
+    pkg_tool: centpkg
+    specfile_path: rpm/conmon.spec
+  conmon-rhel:
+    specfile_path: rpm/conmon.spec
+
+jobs:
+  - job: copr_build
+    trigger: pull_request
+    packages: [conmon-fedora]
+    notifications: &copr_build_failure_notification
+      failure_comment:
+        message: "Ephemeral COPR build failed. @containers/packit-build please check."
+    enable_net: true
+    targets:
+      - fedora-all-aarch64
+      - fedora-all-x86_64
+      - fedora-eln-aarch64
+      - fedora-eln-x86_64
+
+  - job: copr_build
+    trigger: pull_request
+    packages: [conmon-centos]
+    notifications: *copr_build_failure_notification
+    enable_net: true
+    targets:
+      - centos-stream-10-aarch64
+      - centos-stream-10-x86_64
+      - centos-stream-9-aarch64
+      - centos-stream-9-x86_64
+
+  - job: copr_build
+    trigger: pull_request
+    packages: [conmon-rhel]
+    notifications: *copr_build_failure_notification
+    enable_net: true
+    targets:
+      - epel-9-aarch64
+      - epel-9-x86_64
+
+  # Run on commit to main branch
+  - job: copr_build
+    trigger: commit
+    notifications:
+      failure_comment:
+        message: "podman-next COPR build failed. @containers/packit-build please check."
+    branch: main
+    owner: rhcontainerbot
+    project: podman-next
+    enable_net: true
+
+  # Downstream sync for Fedora
+  - job: propose_downstream
+    trigger: release
+    packages: [conmon-fedora]
+    update_release: false
+    dist_git_branches:
+      - fedora-all
+
+  # Downstream sync for CentOS Stream
+  - job: propose_downstream
+    trigger: release
+    packages: [conmon-centos]
+    update_release: false
+    dist_git_branches:
+      - c10s
+
+  - job: koji_build
+    trigger: commit
+    packages: [conmon-fedora]
+    dist_git_branches:
+      - fedora-all
+
+  - job: bodhi_update
+    trigger: commit
+    packages: [conmon-fedora]
+    dist_git_branches:
+      - fedora-branched # rawhide updates are created automatically

0001-Reset-create_pid-after-waitpid-to-prevent-signaling-.patch

@@ -1,32 +0,0 @@
-From 8596fc6462efa2bd0db47485931cfcd704ca0637 Mon Sep 17 00:00:00 2001
-From: Jindrich Novy <jnovy@redhat.com>
-Date: Thu, 21 May 2026 09:38:48 +0200
-Subject: [PATCH] Reset create_pid after waitpid to prevent signaling unrelated
- processes
-
-After the synchronous waitpid(create_pid) succeeds, create_pid was
-never reset to -1. If the PID was later reused by another process,
-on_sig_exit() would send SIGTERM to that unrelated process.
-
-Resolves: RHEL-178025
-
-Signed-off-by: Jindrich Novy <jnovy@redhat.com>
----
- src/conmon.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/conmon.c b/src/conmon.c
-index 0abbd17d..24a7da18 100644
---- a/src/conmon.c
-+++ b/src/conmon.c
-@@ -360,6 +360,7 @@ int main(int argc, char *argv[])
- 			}
- 			pexitf("Failed to wait for `runtime %s`", opt_exec ? "exec" : "create");
- 		}
-+		create_pid = -1;
- 	}
- 
- 	/* For exec operations, a non-zero runtime exit status reflects the exit status of the exec'd command,
--- 
-2.49.0
-

README.md

@@ -0,0 +1,3 @@
+# conmon
+
+The conmon package

README.packit

@@ -0,0 +1,3 @@
+This repository is maintained by packit.
+https://packit.dev/
+The file was generated using packit 1.14.0.post1.dev10+g291d7454f.

conmon.spec

@@ -14,16 +14,18 @@
 %endif
 
 Name: conmon
+%if %{defined rhel}
 Epoch: 3
+%else
+Epoch: 2
+%endif
 Version: 2.2.1
 License: Apache-2.0
-Release: 2%{?dist}
+Release: 1%{?dist}
 Summary: OCI container runtime monitor
 URL: https://github.com/containers/%{name}
 # Tarball fetched from upstream
 Source0: %{url}/archive/v%{version}.tar.gz
-# https://github.com/containers/conmon/pull/659
-Patch0001: 0001-Reset-create_pid-after-waitpid-to-prevent-signaling-.patch
 %if %{with docs}
 BuildRequires: go-md2man
 %endif
@@ -47,7 +49,7 @@ Requires: libseccomp
 sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
 
 %build
-%{__make} DEBUGFLAG="-g" LDFLAGS="-Wl,-z,relro -Wl,-z,now" bin/conmon
+%{__make} DEBUGFLAG="-g" bin/conmon
 
 %if %{with docs}
 %{__make} GOMD2MAN=go-md2man -C docs
@@ -67,414 +69,23 @@ sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
 %license LICENSE
 %doc README.md
 %{_bindir}/%{name}
+
 %if %{with docs}
-%{_mandir}/man8/*
+%{_mandir}/man8/%{name}.8.gz
 %endif
 
 %changelog
-* Mon Jun 22 2026 Jindrich Novy <jnovy@redhat.com> - 3:2.2.1-2
+* Thu Feb 12 2026 Packit <hello@packit.dev> - 2:2.2.1-1
-- reset create_pid after waitpid to prevent signaling unrelated processes
+- Update to version 2.2.1
-- Resolves: RHEL-178025
 
-* Thu Feb 12 2026 Jindrich Novy <jnovy@redhat.com> - 3:2.2.1-1
+* Tue Feb 03 2026 Jindrich Novy <jnovy@redhat.com> - 2:2.2.0-1
-- update to https://github.com/containers/conmon/releases/tag/v2.2.1
-- enable RELRO
-- Related: RHEL-111919
-
-* Thu Feb 05 2026 Jindrich Novy <jnovy@redhat.com> - 3:2.2.0-2
 - update to https://github.com/containers/conmon/releases/tag/v2.2.0
-- Resolves: RHEL-147114
+- Related: RHEL-122178
 
-* Wed Feb 26 2025 Jindrich Novy <jnovy@redhat.com> - 3:2.1.13-1
+* Wed Feb 26 2025 Jindrich Novy <jnovy@redhat.com> - 2:2.1.13-1
 - update to https://github.com/containers/conmon/releases/tag/v2.1.13
-- Resolves: RHEL-80820
+- Resolves: RHEL-80818
 
-* Wed May 29 2024 Jindrich Novy <jnovy@redhat.com> - 3:2.1.12-1
+* Fri Jan 17 2025 Jindrich Novy <jnovy@redhat.com> - 3:2.1.12-4
-- update to https://github.com/containers/conmon/releases/tag/v2.1.12
+- Fix spec file, remove crio
-- Related: RHEL-27608
+- Related: RHEL-58990
-
-* Tue May 07 2024 Jindrich Novy <jnovy@redhat.com> - 3:2.1.11-1
-- update to https://github.com/containers/conmon/releases/tag/v2.1.11
-- Related: RHEL-27608
-
-* Mon Apr 08 2024 Lokesh Mandvekar <lsm5@redhat.com> - 3:2.1.10-2
-- bump epoch to preserve upgrade path from rhel 8.10
-- Related: RHEL-31950
-
-* Tue Jan 02 2024 Jindrich Novy <jnovy@redhat.com> - 2:2.1.10-1
-- update to https://github.com/containers/conmon/releases/tag/v2.1.10
-- Related: RHEL-2112
-
-* Fri Aug 25 2023 Jindrich Novy <jnovy@redhat.com> - 2:2.1.8-1
-- update to https://github.com/containers/conmon/releases/tag/v2.1.8
-- Related: #2176063
-
-* Wed Jun 21 2023 Jindrich Novy <jnovy@redhat.com> - 2:2.1.7-3
-- rebuild
-- Resolves: #2174381
-
-* Tue Apr 18 2023 Jindrich Novy <jnovy@redhat.com> - 2:2.1.7-2
-- bump to preserve upgrade path from 9.2.0
-- Related: #2176063
-
-* Sun Mar 26 2023 Jindrich Novy <jnovy@redhat.com> - 2:2.1.7-1
-- update to https://github.com/containers/conmon/releases/tag/v2.1.7
-- Related: #2176063
-
-* Tue Feb 07 2023 Jindrich Novy <jnovy@redhat.com> - 2:2.1.6-1
-- update to https://github.com/containers/conmon/releases/tag/v2.1.6
-- Related: #2124478
-
-* Mon Nov 07 2022 Jindrich Novy <jnovy@redhat.com> - 2:2.1.5-1
-- update to https://github.com/containers/conmon/releases/tag/v2.1.5
-- Related: #2124478
-
-* Tue Aug 30 2022 Jindrich Novy <jnovy@redhat.com> - 2:2.1.4-1
-- update to https://github.com/containers/conmon/releases/tag/v2.1.4
-- Related: #2061316
-
-* Tue Jul 26 2022 Jindrich Novy <jnovy@redhat.com> - 2:2.1.3-1
-- update to https://github.com/containers/conmon/releases/tag/v2.1.3
-- Related: #2061316
-
-* Thu Jun 16 2022 Jindrich Novy <jnovy@redhat.com> - 2:2.1.2-2
-- update to latest content of https://github.com/containers/conmon/releases/tag/2.1.2
-  (https://github.com/containers/conmon/commit/2bc95ee697e87d5f7b77063cf83fc32739addafe)
-- Related: #2061316
-
-* Tue Jun 14 2022 Jindrich Novy <jnovy@redhat.com> - 2:2.1.2-1
-- update to https://github.com/containers/conmon/releases/tag/v2.1.2
-- Related: #2061316
-
-* Tue May 24 2022 Jindrich Novy <jnovy@redhat.com> - 2:2.1.1-1
-- update to https://github.com/containers/conmon/releases/tag/v2.1.1
-- Related: #2061316
-
-* Fri May 13 2022 Jindrich Novy <jnovy@redhat.com> - 2:2.1.0-3
-- Re-enable debuginfo
-- Related: #2061316
-
-* Wed May 11 2022 Jindrich Novy <jnovy@redhat.com> - 2:2.1.0-2
-- BuildRequires: /usr/bin/go-md2man
-- Related: #2061316
-
-* Tue Jan 25 2022 Jindrich Novy <jnovy@redhat.com> - 2:2.1.0-1
-- update to https://github.com/containers/conmon/releases/tag/v2.1.0
-- Related: #2000051
-
-* Wed Jan 12 2022 Jindrich Novy <jnovy@redhat.com> - 2:2.0.32-1
-- update to https://github.com/containers/conmon/releases/tag/v2.0.32
-- Related: #2000051
-
-* Tue Dec 07 2021 Jindrich Novy <jnovy@redhat.com> - 2:2.0.31-1
-- update to https://github.com/containers/conmon/releases/tag/v2.0.31
-- Related: #2000051
-
-* Fri Oct 01 2021 Jindrich Novy <jnovy@redhat.com> - 2:2.0.30-3
-- perform only sanity/installability tests for now
-- Related: #2000051
-
-* Wed Sep 29 2021 Jindrich Novy <jnovy@redhat.com> - 2:2.0.30-2
-- add gating.yaml
-- Related: #2000051
-
-* Thu Sep 23 2021 Jindrich Novy <jnovy@redhat.com> - 2:2.0.30-1
-- update to https://github.com/containers/conmon/releases/tag/v2.0.30
-- Related: #2000051
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2:2.0.29-4
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 2:2.0.29-3
-- Rebuilt for RHEL 9 BETA for openssl 3.0
-  Related: rhbz#1971065
-
-* Mon Jun 14 2021 Jindrich Novy <jnovy@redhat.com> - 2:2.0.29-2
-- update to https://github.com/containers/conmon/releases/tag/v2.0.29
-- Related: #1970747
-
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 2:2.0.27-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Mar 09 2021 Jindrich Novy <jnovy@redhat.com> - 2:2.0.27-1
-- update to https://github.com/containers/conmon/releases/tag/v2.0.27
-
-* Thu Feb 04 2021 Jindrich Novy <jnovy@redhat.com> - 2:2.0.26-1
-- update to https://github.com/containers/conmon/releases/tag/v2.0.26
-
-* Tue Jan 26 2021 Jindrich Novy <jnovy@redhat.com> - 2:2.0.25-1
-- update to https://github.com/containers/conmon/releases/tag/v2.0.25
-
-* Mon Jan 04 2021 Jindrich Novy <jnovy@redhat.com> - 2:2.0.22-1
-- exclude i686 as golang is not suppoerted there
-
-* Fri Nov 13 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.22-0.9.dev.git2fbeb9f
-- autobuilt 2fbeb9f
-
-* Thu Nov  5 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.22-0.8.dev.gita0ddcb9
-- autobuilt a0ddcb9
-
-* Sat Oct 10 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.22-0.7.dev.gite5e2b93
-- autobuilt e5e2b93
-
-* Tue Oct  6 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.22-0.6.dev.git162c363
-- autobuilt 162c363
-
-* Fri Sep 18 09:34:35 EDT 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.0.22-0.5.dev.git59c2817
-- build with journald support
-
-* Wed Sep 16 16:12:47 UTC 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.22-0.4.dev.git59c2817
-- autobuilt 59c2817
-
-* Tue Sep 15 13:12:54 UTC 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.22-0.3.dev.gitd213bfa
-- autobuilt d213bfa
-
-* Mon Sep 14 14:12:03 UTC 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.22-0.2.dev.giteb93261
-- autobuilt eb93261
-
-* Tue Sep  8 22:12:10 UTC 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.22-0.1.dev.gitdd4fc17
-- bump to 2.0.22
-- autobuilt dd4fc17
-
-* Tue Sep  8 21:12:42 UTC 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.21-0.11.dev.gitbc88ac5
-- autobuilt bc88ac5
-
-* Thu Sep  3 14:13:45 UTC 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.21-0.10.dev.git668b748
-- autobuilt 668b748
-
-* Wed Sep 02 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.0.21-0.9.dev.git1d7b3a5
-- Resolves: #1786090 - build with -g for debuginfo
-
-* Thu Aug 27 14:14:25 UTC 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.21-0.8.dev.git1d7b3a5
-- autobuilt 1d7b3a5
-
-* Wed Aug 26 13:11:37 UTC 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.21-0.7.dev.git6eb222d
-- autobuilt 6eb222d
-
-* Tue Aug 25 15:11:33 UTC 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.21-0.6.dev.git9d61f0f
-- autobuilt 9d61f0f
-
-* Mon Aug 24 14:11:36 UTC 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.21-0.5.dev.git76548e1
-- autobuilt 76548e1
-
-* Fri Aug 21 15:10:39 UTC 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.21-0.4.dev.git7ab6aa1
-- autobuilt 7ab6aa1
-
-* Wed Aug 05 16:10:09 GMT 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.21-0.3.dev.git5a6b2ac
-- autobuilt 5a6b2ac
-
-* Tue Aug 04 2020 Peter Hunt <pehunt@redhat.com> - 2:2.0.21-0.2.dev.gitfe1563c
-- rebuild
-
-* Tue Jul 28 14:09:38 GMT 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.21-0.1.dev.gitfe1563c
-- bump to 2.0.21
-- autobuilt fe1563c
-
-* Mon Jul 27 21:09:33 GMT 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.20-0.3.dev.git5bc12e0
-- autobuilt 5bc12e0
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.0.20-0.2.dev.git3c396d4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jul 15 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.20-0.1.dev.git3c396d4
-- bump to 2.0.20
-- autobuilt 3c396d4
-
-* Wed Jul 15 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.19-0.6.dev.git4fea27e
-- autobuilt 4fea27e
-
-* Wed Jul 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.19-0.5.dev.giteff699e
-- autobuilt eff699e
-
-* Mon Jun 29 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.19-0.4.dev.git9a1d403
-- autobuilt 9a1d403
-
-* Mon Jun 22 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.19-0.3.dev.git42414b8
-- autobuilt 42414b8
-
-* Wed Jun 17 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.19-0.2.dev.gitab8f5e5
-- autobuilt ab8f5e5
-
-* Mon Jun 15 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.19-0.1.dev.git96ea3a2
-- bump to 2.0.19
-- autobuilt 96ea3a2
-
-* Wed Jun 10 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.18-0.8.dev.git2c32b99
-- autobuilt 2c32b99
-
-* Mon Jun 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.18-0.7.dev.gitf951578
-- autobuilt f951578
-
-* Wed Jun 03 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.18-0.6.dev.git50aeae4
-- autobuilt 50aeae4
-
-* Wed Jun 03 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.18-0.5.dev.gitf12e90b
-- autobuilt f12e90b
-
-* Tue Jun 02 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.18-0.4.dev.gitd951a5a
-- autobuilt d951a5a
-
-* Mon Jun 01 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.18-0.3.dev.git63d0e3d
-- autobuilt 63d0e3d
-
-* Wed May 27 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.18-0.2.dev.gitd0f367d
-- autobuilt d0f367d
-
-* Tue May 26 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.18-0.1.dev.git27bb67e
-- bump to 2.0.18
-- autobuilt 27bb67e
-
-* Tue May 26 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.17-0.3.dev.git27eb304
-- autobuilt 27eb304
-
-* Mon May 25 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.0.17-0.2.dev.git82e9358
-- depend on glib2
-
-* Tue May 12 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.17-0.1.dev.git82e9358
-- bump to 2.0.17
-- autobuilt 82e9358
-
-* Tue May 12 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.16-0.4.dev.gitedd4aaa
-- autobuilt edd4aaa
-
-* Tue May 12 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.16-0.3.dev.git6fa9c2a
-- autobuilt 6fa9c2a
-
-* Mon May 11 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.16-0.2.dev.git42cb289
-- autobuilt 42cb289
-
-* Thu Apr 02 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.16-0.1.dev.gite34c6d6
-- bump to 2.0.16
-- autobuilt e34c6d6
-
-* Wed Apr 01 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.15-0.6.dev.gitb763fdd
-- autobuilt b763fdd
-
-* Tue Mar 31 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.15-0.5.dev.git9c9b3e7
-- autobuilt 9c9b3e7
-
-* Mon Mar 30 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.15-0.4.dev.git3ea6c68
-- autobuilt 3ea6c68
-
-* Wed Mar 25 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.15-0.3.dev.git89b2478
-- autobuilt 89b2478
-
-* Mon Mar 23 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.15-0.2.dev.gitff29dd6
-- autobuilt ff29dd6
-
-* Fri Mar 20 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.15-0.1.dev.gitb97c274
-- bump to 2.0.15
-- autobuilt b97c274
-
-* Fri Mar 20 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.14-0.2.dev.git1b53637
-- autobuilt 1b53637
-
-* Tue Mar 17 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.14-0.1.dev.git849ab62
-- bump to 2.0.14
-- autobuilt 849ab62
-
-* Mon Mar 16 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.12-0.1.dev.git51c0e7b
-- bump to 2.0.12
-- autobuilt 51c0e7b
-
-* Tue Feb 11 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.11-0.6.dev.git86aa80b
-- autobuilt 86aa80b
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.0.11-0.5.dev.git77f4a51
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jan 15 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.11-0.4.dev.git77f4a51
-- autobuilt 77f4a51
-
-* Tue Jan 14 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.11-0.3.dev.gitccfdbb6
-- autobuilt ccfdbb6
-
-* Sat Jan 11 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.11-0.2.dev.git5039b44
-- autobuilt 5039b44
-
-* Wed Jan 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.11-0.1.dev.gitad05887
-- bump to 2.0.11
-- autobuilt ad05887
-
-* Tue Jan 07 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.10-0.3.dev.git26f6817
-- autobuilt 26f6817
-
-* Tue Jan 07 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.10-0.2.dev.git6e39a83
-- autobuilt 6e39a83
-
-* Mon Jan 06 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.10-0.1.dev.gitb7bfc7b
-- bump to 2.0.10
-- autobuilt b7bfc7b
-
-* Mon Jan 06 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.9-0.3.dev.git1560392
-- autobuilt 1560392
-
-* Fri Dec 20 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.9-0.2.dev.gitb17d81b
-- autobuilt b17d81b
-
-* Fri Dec 13 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.9-0.1.dev.gitc2e2e67
-- bump to 2.0.9
-- autobuilt c2e2e67
-
-* Fri Dec 13 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.8-0.2.dev.gitc8f7443
-- autobuilt c8f7443
-
-* Thu Dec 12 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.8-0.1.dev.git036ff29
-- bump to 2.0.8
-- autobuilt 036ff29
-
-* Thu Dec 12 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.7-0.3.dev.git4100fb2
-- autobuilt 4100fb2
-
-* Thu Dec 12 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.7-0.2.dev.git95ed45a
-- autobuilt 95ed45a
-
-* Wed Dec 11 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.7-0.1.dev.git8ba9575
-- bump to 2.0.7
-- autobuilt 8ba9575
-
-* Wed Dec 11 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.6-0.2.dev.gitba14d9c
-- autobuilt ba14d9c
-
-* Tue Dec 10 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.6-0.1.dev.gitbc9e976
-- bump to 2.0.6
-- autobuilt bc9e976
-
-* Tue Dec 10 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.5-0.2.dev.gitc792503
-- autobuilt c792503
-
-* Mon Dec 09 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.5-0.1.dev.gitfd5ac47
-- bump to 2.0.5
-- autobuilt fd5ac47
-
-* Mon Dec 02 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.4-0.3.dev.gitdf8c6aa
-- autobuilt df8c6aa
-
-* Fri Nov 29 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.4-0.2.dev.git42bce45
-- autobuilt 42bce45
-
-* Mon Nov 11 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.4-0.1.dev.gitf6d23b5
-- bump to 2.0.4
-- autobuilt f6d23b5
-
-* Mon Nov 11 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.3-0.3.dev.git098fcce
-- autobuilt 098fcce
-
-* Thu Nov 07 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.3-0.2.dev.git002da25
-- autobuilt 002da25
-
-* Mon Oct 21 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.0.3-0.1.dev.gitbc758d8
-- built commit bc758d8
-
-* Wed Sep 25 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.0.2-0.1.dev.git422ce21
-- build latest upstream master
-
-* Tue Sep 10 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.0.0-2
-- remove BR: go-md2man since no manpages yet
-
-* Tue Sep 10 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.0.0-1
-- bump to v2.0.0
-
-* Fri May 31 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:0.2.0-1
-- initial package

gating.yaml

@@ -1,13 +1,6 @@
+# recipients: jnovy, lsm5, santiago
 --- !Policy
 product_versions:
-  - fedora-*
+  - rhel-10
-decision_context: bodhi_update_push_stable
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
-
---- !Policy
-product_versions:
-  - rhel-*
 decision_context: osci_compose_gate
-rules:
+rules: []
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

plans/conmon.fmf

@@ -1,27 +0,0 @@
----
-summary: Run conmon tests
-description: Test plan for conmon
-contact: Yuhui Jiang <yujiang@redhat.com>
-
-provision:
-  how: container
-
-prepare:
-  - name: Install packages
-    how: install
-    package: [crun, podman, podman-tests, git]
-  - name: Prepare bats
-    how: shell
-    script:
-      - rm -rf /tmp/bats-core-1.11.0
-      - curl -s -L https://github.com/bats-core/bats-core/archive/refs/tags/v1.11.0.tar.gz | tar xvz -C /tmp
-      - /tmp/bats-core-1.11.0/install.sh /usr
-
-discover:
-  how: fmf
-  filter: 'tag: gate'
-  url: https://gitlab.com/yujiang1/conmon.git
-  ref: c9s
-
-execute:
-  how: tmt

sources

@@ -1 +1 @@
-SHA512 (v2.2.1.tar.gz) = 52513fc25b0db0b7c9c99aa63f6be4c495add350b9269fad67136f728d3399dbb54c5fa526d52c158c67956ded8980f1cc3624fc531a152b16c09caa3399be3b
+SHA512 (v2.2.0.tar.gz) = 8a14d47be06f3b768118216afc7b9cf5da65c19d896f55febe92250cf9f7aa7c9b8c58736f0a52d44c2ff9f4a6bc99fa3f9ffe22a7905d332b2fd816b3a2e2c9

tests/main.fmf

@@ -1,14 +0,0 @@
----
-summary: conmon tests
-description: Using podman system tests to test conmon
-contact: Yuhui Jiang <yujiang@redhat.com>
-framework: shell
-require: [podman,conmon]
-
-tag: 'gate'
-
-test: |
-  /usr/bin/bats -t /usr/share/podman/test/system/030-run.bats
-  /usr/bin/bats -t /usr/share/podman/test/system/075-exec.bats
-
-duration: 15m

tests/test_podman.sh

@@ -0,0 +1,17 @@
+#!/bin/bash -e
+#
+# Simple podman tests
+#
+
+# Log program and kernel versions
+echo "Important package versions:"
+(
+    uname -r
+    rpm -qa | egrep 'podman|conmon|crun|runc|iptable|slirp|systemd|container-selinux' | sort
+) | sed -e 's/^/  /'
+
+# Log environment; or at least the useful bits
+echo "Environment:"
+env | grep -v LS_COLORS= | sort | sed -e 's/^/  /'
+
+bats /usr/share/podman/test/system

tests/test_podman.yml

@@ -0,0 +1,27 @@
+---
+- hosts: localhost
+  roles:
+    - role: standard-test-basic
+      tags:
+        - classic
+        - container
+      required_packages:
+        - bats
+        - conmon
+        - podman
+        - podman-tests
+      tests:
+        - root-test:
+            dir: ./
+            run: ./test_podman.sh
+            timeout: 45m
+            environment:
+              QUADLET: /usr/libexec/podman/quadlet
+        - rootless-test:
+            # running the test with su doesn't create the directory for fedora user on /run/user/
+            # so create it manually
+            dir: ./
+            run: loginctl enable-linger fedora; su -c ${PWD}/test_podman.sh - fedora
+            timeout: 45m
+            environment:
+              QUADLET: /usr/libexec/podman/quadlet

tests/tests.yml

@@ -0,0 +1 @@
+- import_playbook: test_podman.yml