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

Draft: [c9s] TMT: fetch tests from upstream

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

.gitignore

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

README.md

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

conmon.spec

@@ -1,101 +1,52 @@
-%global with_debug 1
-
-%if 0%{?with_debug}
-%global _find_debuginfo_dwz_opts %{nil}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
-%if %{defined rhel}
-%bcond_with docs
-%else
-%bcond_without docs
-%endif
+%global with_check 0
 
 Name: conmon
-%if %{defined rhel}
 Epoch: 3
-%else
-Epoch: 2
-%endif
-Version: 2.2.1
-License: Apache-2.0
-Release: 4%{?dist}
+Version: 2.1.12
+Release: %autorelease
 Summary: OCI container runtime monitor
+License: ASL 2.0
 URL: https://github.com/containers/%{name}
-# Tarball fetched from upstream
 Source0: %{url}/archive/v%{version}.tar.gz
-%if %{with docs}
-BuildRequires: go-md2man
-%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: make
-BuildRequires: pkgconfig(libsystemd)
-BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(libseccomp)
-Requires: glib2
-Requires: systemd-libs
-Requires: libseccomp
+BuildRequires: git
+BuildRequires: glib2-devel
+BuildRequires: systemd-devel
+BuildRequires: golang >= 1.12.12-4
+BuildRequires: /usr/bin/go-md2man
+BuildRequires: libseccomp-devel
 
 %description
 %{summary}.
 
 %prep
-%autosetup -Sgit %{name}-%{version}
-sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
+%if 0%{?branch:1}
+%autosetup -Sgit -n containers-%{name}-%{shortcommit0}
+%else
+%autosetup -Sgit -n %{name}-%{commit0}
+%endif
 
 %build
-%make_build bin/conmon CFLAGS="%{optflags}" LDFLAGS="%{build_ldflags}"
-
-%if %{with docs}
-%make_build GOMD2MAN=go-md2man -C docs
-%endif
+export CFLAGS="%{optflags} -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
+export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
+%{__make} all
 
 %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}
 
 %files
 %license LICENSE
 %doc README.md
 %{_bindir}/%{name}
-
-%if %{with docs}
-%{_mandir}/man8/%{name}.8.gz
-%endif
+%{_mandir}/man8/*
 
 %changelog
-* Fri May 29 2026 Jindrich Novy <jnovy@redhat.com> - 2:2.2.1-4
-- Add TMT test infrastructure for tier0 gating
-- Resolves: RHEL-180349
-
-* Fri Feb 27 2026 Jindrich Novy <jnovy@redhat.com> - 2:2.2.1-3
-- pass %%{optflags} and %%{build_ldflags} to enable stack protector
-  and FORTIFY_SOURCE hardening flags
-- Resolves: RHEL-152224
-
-* Mon Feb 16 2026 Jindrich Novy <jnovy@redhat.com> - 2:2.2.1-2
-- use proper macros in spec file and simplify
-- Related: RHEL-111917
-
-* Thu Feb 12 2026 Jindrich Novy <jnovy@redhat.com> - 2:2.2.1-1
-- update to https://github.com/containers/conmon/releases/tag/v2.2.1
-- enable RELRO
-- Related: RHEL-122178
-
-* 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.0
-- Related: RHEL-122178
-
-* 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
+%autochangelog

gating.yaml

@@ -1,7 +1,13 @@
-# recipients: jnovy, lsm5, santiago
 --- !Policy
 product_versions:
-  - rhel-10
+  - fedora-*
+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:
   - !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: jnovy@redhat.com
-
-discover:
-    how: fmf
-
-provision:
-    how: artemis
-
-prepare:
-    - how: install
-      package:
-        - crun
-        - podman
-        - podman-tests
-        - git
-    - how: shell
-      script: |
-        BATS_VERSION=1.11.0
-        curl -L https://github.com/bats-core/bats-core/archive/refs/tags/v$BATS_VERSION.tar.gz | tar zx
-        cd bats-core-$BATS_VERSION
-        ./install.sh /usr
-
-execute:
-    how: tmt

sources

@@ -1 +1 @@
-SHA512 (v2.2.1.tar.gz) = 52513fc25b0db0b7c9c99aa63f6be4c495add350b9269fad67136f728d3399dbb54c5fa526d52c158c67956ded8980f1cc3624fc531a152b16c09caa3399be3b
+SHA512 (v2.1.12.tar.gz) = 06668aa35f5752e3d383f0a2cdf88f7c5056bdef96756aa230279ae25ef1d6b6bfd14888d35907062404670ae85d71d2d7258577abff70b74fa49bff6c2d9d20

tests/main.fmf

@@ -1,8 +0,0 @@
-summary: Run basic podman tests to verify conmon
-test: cd /usr/share/podman/test/system && bats 030-run.bats 075-exec.bats
-require:
-    - podman
-    - conmon
-duration: 15m
-tag:
-    - gate

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