Merge branch 'c9s-tmt-update' into 'c9s'

Draft: [c9s] TMT: fetch tests from upstream

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

conmon.spec

@@ -1,62 +1,53 @@
-%global with_debug 1
+%global with_check 0
 
-%if 0%{?with_debug}
+# https://github.com/containers/conmon
-%global _find_debuginfo_dwz_opts %{nil}
+%global import_path github.com/containers/%{name}
-%global _dwz_low_mem_die_limit 0
+%global git0 https://%{import_path}
-%else
+%global commit0 e8896631295ccb0bfdda4284f1751be19b483264
-%global debug_package %{nil}
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-%endif
-
-%if %{defined rhel}
-%bcond_with docs
-%else
-%bcond_without docs
-%endif
 
 Name: conmon
 Epoch: 3
-Version: 2.2.1
+Version: 2.1.12
-License: Apache-2.0
 Release: 1%{?dist}
 Summary: OCI container runtime monitor
-URL: https://github.com/containers/%{name}
+License: ASL 2.0
-# Tarball fetched from upstream
+URL: %{git0}
-Source0: %{url}/archive/v%{version}.tar.gz
+%if 0%{?branch:1}
-%if %{with docs}
+Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz
-BuildRequires: go-md2man
+%else
+Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz
 %endif
+# https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures
+#ExclusiveArch: %%{go_arches}
+# still use arch exclude as the macro above still refers %%{ix86} in RHEL8.4:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1905383
+ExcludeArch: %{ix86}
 BuildRequires: gcc
-BuildRequires: git-core
+BuildRequires: git
 BuildRequires: glib2-devel
-BuildRequires: libseccomp-devel
-BuildRequires: pkgconfig
 BuildRequires: systemd-devel
-BuildRequires: systemd-libs
+BuildRequires: golang >= 1.12.12-4
-BuildRequires: make
+BuildRequires: /usr/bin/go-md2man
-Requires: glib2
+BuildRequires: libseccomp-devel
-Requires: systemd-libs
-Requires: libseccomp
 
 %description
 %{summary}.
 
 %prep
-%autosetup -Sgit %{name}-%{version}
+%if 0%{?branch:1}
-sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
+%autosetup -Sgit -n containers-%{name}-%{shortcommit0}
+%else
+%autosetup -Sgit -n %{name}-%{commit0}
+%endif
 
 %build
-%{__make} DEBUGFLAG="-g" LDFLAGS="-Wl,-z,relro -Wl,-z,now" bin/conmon
+export CFLAGS="%{optflags} -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
-
+export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
-%if %{with docs}
+%{__make} all
-%{__make} GOMD2MAN=go-md2man -C docs
-%endif
 
 %install
-%{__make} PREFIX=%{buildroot}%{_prefix} install.bin
+%{__make} PREFIX=%{buildroot}%{_prefix} install
-
-%if %{with docs}
-%{__make} PREFIX=%{buildroot}%{_prefix} -C docs install
-%endif
 
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
@@ -65,24 +56,9 @@ sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
 %license LICENSE
 %doc README.md
 %{_bindir}/%{name}
-%if %{with docs}
 %{_mandir}/man8/*
-%endif
 
 %changelog
-* Thu Feb 12 2026 Jindrich Novy <jnovy@redhat.com> - 3:2.2.1-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
-
-* Wed Feb 26 2025 Jindrich Novy <jnovy@redhat.com> - 3:2.1.13-1
-- update to https://github.com/containers/conmon/releases/tag/v2.1.13
-- Resolves: RHEL-80820
-
 * Wed May 29 2024 Jindrich Novy <jnovy@redhat.com> - 3:2.1.12-1
 - update to https://github.com/containers/conmon/releases/tag/v2.1.12
 - Related: RHEL-27608

gating.yaml

@@ -1,7 +1,10 @@
 --- !Policy
 product_versions:
   - fedora-*
-decision_context: bodhi_update_push_stable
+decision_contexts:
+  - bodhi_update_push_stable
+  - bodhi_update_push_testing
+subject_type: koji_build
 rules:
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-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

plans/podman.fmf

@@ -0,0 +1,43 @@
+prepare:
+    - name: packages
+      how: install
+      package: [bats, iptables, 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.2.1.tar.gz) = 52513fc25b0db0b7c9c99aa63f6be4c495add350b9269fad67136f728d3399dbb54c5fa526d52c158c67956ded8980f1cc3624fc531a152b16c09caa3399be3b
+SHA512 (conmon-2.1.12-e889663.tar.gz) = 8e77b9532a882d212e8e62fb4101aea1c6cc7d3ae943415451bb6f59492e7e816abd5479032c12f042688191dcde56a2aa18c287455b3d112db1fbdb22556c9b

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