12 Commits

Author SHA1 Message Date
Jindrich Novy 37f945cce1 Add TMT test infrastructure for conmon
Add .fmf/, plans/, and tests/ directories to enable automated
tier0 testing in the RHEL-on-GitLab MR pipeline. Port TMT
configuration from rhel-9.8.0 branch, updated to reference
c10s branch of the test repository.

Also add tier0 gating rule to gating.yaml.

Resolves: RHEL-180349
2026-05-29 12:48:26 +02:00
Jindrich Novy fafd0b1bef conmon-2.2.1-3.el10
- pass %%{optflags} and %%{build_ldflags} to enable stack protector
  and FORTIFY_SOURCE hardening flags
- Resolves: RHEL-152224

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
2026-02-27 08:28:47 +01:00
Jindrich Novy 6d49e1f164 conmon-2.2.1-2.el10
- use proper macros in spec file and simplify
- Related: RHEL-111917

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
2026-02-16 11:30:05 +01:00
Jindrich Novy ba7b5c8d05 conmon-2.2.1-1.el10
- update to https://github.com/containers/conmon/releases/tag/v2.2.1
- enable RELRO
- Related: RHEL-122178

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
2026-02-12 20:25:12 +01:00
Jindrich Novy 4b1b6e1f1b conmon-2.2.0-1.el10
- update to https://github.com/containers/conmon/releases/tag/v2.2.0
- Related: RHEL-122178

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
2026-02-03 17:29:10 +01:00
Jindrich Novy ab6d86141e conmon-2.1.13-1.el10
- update to https://github.com/containers/conmon/releases/tag/v2.1.13
- Resolves: RHEL-80818

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
2025-02-26 12:52:34 +01:00
Jindrich Novy 6e8b268157 conmon-2.1.12-4.el10
- Fix spec file, remove crio
- Related: RHEL-58990

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
2025-01-17 14:36:12 +01:00
Troy Dawson f6671a8174 Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
2024-10-29 08:19:02 -07:00
Troy Dawson 63c9e6309f Bump release for June 2024 mass rebuild 2024-06-24 08:39:00 -07:00
Jindrich Novy a600b8f72b conmon-2.1.12-1.el10
- update to https://github.com/containers/conmon/releases/tag/v2.1.12
- Related: RHEL-34195

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
2024-05-27 17:54:22 +02:00
Jindrich Novy d48bb55ef2 conmon-2.1.11-1.el10
- update to https://github.com/containers/conmon/releases/tag/v2.1.11
- Related: RHEL-34195

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
2024-05-01 13:13:19 +02:00
Jindrich Novy 753bc964b5 Update gating.yaml to RHEL-10
Related: RHELMISC-3908

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
2024-04-29 11:44:32 +02:00
7 changed files with 86 additions and 155 deletions
+1
View File
@@ -0,0 +1 @@
1
+1 -119
View File
@@ -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
+44 -24
View File
@@ -7,36 +7,34 @@
%global debug_package %{nil} %global debug_package %{nil}
%endif %endif
%if 0%{?rhel} %if %{defined rhel}
%bcond_with docs %bcond_with docs
%else %else
%bcond_without docs %bcond_without docs
%endif %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 Name: conmon
%if %{defined rhel}
Epoch: 3
%else
Epoch: 2 Epoch: 2
Version: %{gen_version} %endif
Version: 2.2.1
License: Apache-2.0 License: Apache-2.0
Release: %autorelease Release: 4%{?dist}
Summary: OCI container runtime monitor Summary: OCI container runtime monitor
URL: https://github.com/containers/%{name} URL: https://github.com/containers/%{name}
# Tarball fetched from upstream # Tarball fetched from upstream
Source0: %{url}/archive/%{built_tag}.tar.gz Source0: %{url}/archive/v%{version}.tar.gz
%if %{with docs} %if %{with docs}
ExclusiveArch: %{golang_arches_future}
BuildRequires: go-md2man BuildRequires: go-md2man
%endif %endif
BuildRequires: gcc BuildRequires: gcc
BuildRequires: git-core BuildRequires: git-core
BuildRequires: glib2-devel
BuildRequires: libseccomp-devel
BuildRequires: systemd-devel
BuildRequires: systemd-libs
BuildRequires: make BuildRequires: make
BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(libseccomp)
Requires: glib2 Requires: glib2
Requires: systemd-libs Requires: systemd-libs
Requires: libseccomp Requires: libseccomp
@@ -45,37 +43,59 @@ Requires: libseccomp
%{summary}. %{summary}.
%prep %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.bin: bin\/conmon/install.bin:/' Makefile
sed -i 's/install.crio: bin\/conmon/install.crio:/' Makefile
%build %build
%{__make} DEBUGFLAG="-g" bin/conmon %make_build bin/conmon CFLAGS="%{optflags}" LDFLAGS="%{build_ldflags}"
%if %{with docs} %if %{with docs}
%{__make} GOMD2MAN=go-md2man -C docs %make_build GOMD2MAN=go-md2man -C docs
%endif %endif
%install %install
%{__make} PREFIX=%{buildroot}%{_prefix} install.bin install.crio %{__make} PREFIX=%{buildroot}%{_prefix} install.bin
%if %{with docs} %if %{with docs}
%{__make} PREFIX=%{buildroot}%{_prefix} -C docs install %{__make} PREFIX=%{buildroot}%{_prefix} -C docs install
%endif %endif
#define license tag if not already defined
%{!?_licensedir:%global license %doc}
%files %files
%license LICENSE %license LICENSE
%doc README.md %doc README.md
%{_bindir}/%{name} %{_bindir}/%{name}
%{_libexecdir}/crio/%{name}
%dir %{_libexecdir}/crio
%if %{with docs} %if %{with docs}
%{_mandir}/man8/%{name}.8.gz %{_mandir}/man8/%{name}.8.gz
%endif %endif
%changelog %changelog
%autochangelog * 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
+4 -11
View File
@@ -1,14 +1,7 @@
# recipients: jnovy, lsm5, santiago
--- !Policy --- !Policy
product_versions: 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} - !PassingTestCaseRule {test_case_name: osci.brew-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}
+27
View File
@@ -0,0 +1,27 @@
---
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
+1 -1
View File
@@ -1 +1 @@
SHA512 (v2.1.8.tar.gz) = a277de8f8adf001c3e3ef6ef19d4bade36d48c5395a624ee99cb22708ea26a9954df76362006a1331efc06265cb790883b43e84f0006f80c1725a7470ff244c3 SHA512 (v2.2.1.tar.gz) = 52513fc25b0db0b7c9c99aa63f6be4c495add350b9269fad67136f728d3399dbb54c5fa526d52c158c67956ded8980f1cc3624fc531a152b16c09caa3399be3b
+8
View File
@@ -0,0 +1,8 @@
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