Merge branch 'c10s-tmt' into 'c10s'

Draft: [c10s] TMT: initial enablement

See merge request redhat/centos-stream/rpms/conmon!46

.fmf/version

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

.gitignore

@@ -1,119 +1 @@
-/conmon-e217fdf.tar.gz
+/*.tar.*
-/conmon-422ce21.tar.gz
-/conmon-4dc8bcf.tar.gz
-/conmon-bc758d8.tar.gz
-/conmon-002da25.tar.gz
-/conmon-098fcce.tar.gz
-/conmon-f6d23b5.tar.gz
-/conmon-42bce45.tar.gz
-/conmon-df8c6aa.tar.gz
-/conmon-fd5ac47.tar.gz
-/conmon-c792503.tar.gz
-/conmon-bc9e976.tar.gz
-/conmon-ba14d9c.tar.gz
-/conmon-8ba9575.tar.gz
-/conmon-95ed45a.tar.gz
-/conmon-4100fb2.tar.gz
-/conmon-036ff29.tar.gz
-/conmon-c8f7443.tar.gz
-/conmon-c2e2e67.tar.gz
-/conmon-b17d81b.tar.gz
-/conmon-1560392.tar.gz
-/conmon-b7bfc7b.tar.gz
-/conmon-6e39a83.tar.gz
-/conmon-26f6817.tar.gz
-/conmon-ad05887.tar.gz
-/conmon-5039b44.tar.gz
-/conmon-ccfdbb6.tar.gz
-/conmon-77f4a51.tar.gz
-/conmon-86aa80b.tar.gz
-/conmon-51c0e7b.tar.gz
-/conmon-849ab62.tar.gz
-/conmon-1b53637.tar.gz
-/conmon-b97c274.tar.gz
-/conmon-ff29dd6.tar.gz
-/conmon-89b2478.tar.gz
-/conmon-3ea6c68.tar.gz
-/conmon-9c9b3e7.tar.gz
-/conmon-b763fdd.tar.gz
-/conmon-e34c6d6.tar.gz
-/conmon-42cb289.tar.gz
-/conmon-6fa9c2a.tar.gz
-/conmon-edd4aaa.tar.gz
-/conmon-82e9358.tar.gz
-/conmon-27eb304.tar.gz
-/conmon-27bb67e.tar.gz
-/conmon-d0f367d.tar.gz
-/conmon-63d0e3d.tar.gz
-/conmon-d951a5a.tar.gz
-/conmon-f12e90b.tar.gz
-/conmon-50aeae4.tar.gz
-/conmon-f951578.tar.gz
-/conmon-2c32b99.tar.gz
-/conmon-96ea3a2.tar.gz
-/conmon-ab8f5e5.tar.gz
-/conmon-42414b8.tar.gz
-/conmon-9a1d403.tar.gz
-/conmon-eff699e.tar.gz
-/conmon-4fea27e.tar.gz
-/conmon-3c396d4.tar.gz
-/conmon-5bc12e0.tar.gz
-/conmon-fe1563c.tar.gz
-/conmon-5a6b2ac.tar.gz
-/conmon-7ab6aa1.tar.gz
-/conmon-76548e1.tar.gz
-/conmon-9d61f0f.tar.gz
-/conmon-6eb222d.tar.gz
-/conmon-1d7b3a5.tar.gz
-/conmon-668b748.tar.gz
-/conmon-bc88ac5.tar.gz
-/conmon-dd4fc17.tar.gz
-/conmon-eb93261.tar.gz
-/conmon-d213bfa.tar.gz
-/conmon-59c2817.tar.gz
-/conmon-162c363.tar.gz
-/conmon-e5e2b93.tar.gz
-/conmon-a0ddcb9.tar.gz
-/conmon-2fbeb9f.tar.gz
-/conmon-5df41fb.tar.gz
-/conmon-b1c5187.tar.gz
-/conmon-c704d3a.tar.gz
-/conmon-05b8046.tar.gz
-/conmon-bae24d6.tar.gz
-/conmon-5e42e54.tar.gz
-/conmon-7bc96c7.tar.gz
-/conmon-37217a3.tar.gz
-/conmon-0331601.tar.gz
-/conmon-6c8068c.tar.gz
-/conmon-3af2776.tar.gz
-/conmon-de1c681.tar.gz
-/conmon-de1a153.tar.gz
-/conmon-2b87314.tar.gz
-/conmon-c3f31c0.tar.gz
-/conmon-7310bf1.tar.gz
-/conmon-3ac015e.tar.gz
-/conmon-c42f0e7.tar.gz
-/conmon-551605f.tar.gz
-/conmon-3efab3e.tar.gz
-/conmon-372fa19.tar.gz
-/conmon-dd63dcb.tar.gz
-/conmon-2947bb2.tar.gz
-/conmon-3161452.tar.gz
-/conmon-b033cb5.tar.gz
-/conmon-75e067e.tar.gz
-/conmon-24c73c2.tar.gz
-/conmon-1ef2468.tar.gz
-/7381063391d2071a3d27a6e80c9c84d741fb4221.tar.gz
-/v2.0.29.tar.gz
-/v2.0.30.tar.gz
-/v2.0.31.tar.gz
-/v2.0.32.tar.gz
-/v2.1.0.tar.gz
-/v2.1.1.tar.gz
-/v2.1.2.tar.gz
-/v2.1.3.tar.gz
-/v2.1.4.tar.gz
-/v2.1.5.tar.gz
-/v2.1.6.tar.gz
-/v2.1.7.tar.gz
-/v2.1.8.tar.gz

conmon.spec

@@ -7,25 +7,25 @@
 %global debug_package %{nil}
 %endif
 
-%if 0%{?rhel}
+%if %{defined rhel}
 %bcond_with docs
 %else
 %bcond_without docs
 %endif
 
-%global built_tag v2.1.8
-%global built_tag_strip %(b=%{built_tag}; echo ${b:1})
-%global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
-
 Name: conmon
+%if %{defined rhel}
+Epoch: 3
+%else
 Epoch: 2
-Version: %{gen_version}
+%endif
+Version: 2.1.13
 License: Apache-2.0
-Release: %autorelease
+Release: 1%{?dist}
 Summary: OCI container runtime monitor
 URL: https://github.com/containers/%{name}
 # Tarball fetched from upstream
-Source0: %{url}/archive/%{built_tag}.tar.gz
+Source0: %{url}/archive/v%{version}.tar.gz
 %if %{with docs}
 ExclusiveArch: %{golang_arches_future}
 BuildRequires: go-md2man
@@ -45,9 +45,8 @@ Requires: libseccomp
 %{summary}.
 
 %prep
-%autosetup -Sgit %{name}-%{built_tag_strip}
+%autosetup -Sgit %{name}-%{version}
 sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
-sed -i 's/install.crio: bin\/conmon/install.crio:/' Makefile
 
 %build
 %{__make} DEBUGFLAG="-g" bin/conmon
@@ -57,7 +56,7 @@ sed -i 's/install.crio: bin\/conmon/install.crio:/' Makefile
 %endif
 
 %install
-%{__make} PREFIX=%{buildroot}%{_prefix} install.bin install.crio
+%{__make} PREFIX=%{buildroot}%{_prefix} install.bin
 
 %if %{with docs}
 %{__make} PREFIX=%{buildroot}%{_prefix} -C docs install
@@ -70,12 +69,16 @@ sed -i 's/install.crio: bin\/conmon/install.crio:/' Makefile
 %license LICENSE
 %doc README.md
 %{_bindir}/%{name}
-%{_libexecdir}/crio/%{name}
-%dir %{_libexecdir}/crio
 
 %if %{with docs}
 %{_mandir}/man8/%{name}.8.gz
 %endif
 
 %changelog
-%autochangelog
+* 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-80818
+
+* Fri Jan 17 2025 Jindrich Novy <jnovy@redhat.com> - 3:2.1.12-4
+- Fix spec file, remove crio
+- Related: RHEL-58990

gating.yaml

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

plans/podman.fmf

@@ -0,0 +1,43 @@
+prepare:
+    - name: packages
+      how: install
+      package: [bats, podman-tests]
+
+adjust:
+    - when: "initiator == packit"
+      because: "We need to test with updated packages from rhcontainerbot/podman-next copr"
+      prepare+:
+        how: shell
+        script: |
+            sed -i -n '/^priority=/!p;$apriority=1' /etc/yum.repos.d/*podman-next*.repo
+            dnf -y upgrade --allowerasing
+    # FIXME: Use epel10 once bats is available there
+    - when: distro == centos-stream-10 or distro == rhel-10
+      because: "bats isn't yet available on epel10"
+      prepare+:
+        how: install
+        copr: rhcontainerbot/bats-el10
+        package: bats
+    - when: distro == centos-stream-9 or distro == rhel-9
+      because: "bats is present on EPEL on rhel9 / c9s"
+      prepare+:
+        how: feature
+        epel: enabled
+
+discover:
+    how: fmf
+    url: https://github.com/lsm5/podman
+    ref: "tmt-fedora-centos"
+
+execute:
+    how: tmt
+
+/system/local/root:
+    summary: Run podman system rootful tests
+    discover+:
+        filter: 'tag:local & tag:root'
+
+/system/local/rootless:
+    summary: Run podman system rootless tests
+    discover+:
+        filter: 'tag:local & tag:rootless'

sources

@@ -1 +1 @@
-SHA512 (v2.1.8.tar.gz) = a277de8f8adf001c3e3ef6ef19d4bade36d48c5395a624ee99cb22708ea26a9954df76362006a1331efc06265cb790883b43e84f0006f80c1725a7470ff244c3
+SHA512 (v2.1.13.tar.gz) = cb98b26b3c5f5e5f0b09f5373bd58dc958b66ac4edcac2aa509f48be8b7e9a33001428016290944c4002ddbf63e11fb4657aaad879c89c5776f8c8031f4d1d08

tests/test_podman.sh

@@ -1,17 +0,0 @@
-#!/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

@@ -1,27 +0,0 @@
----
-- 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

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