mirror of
https://gitlab.com/redhat/centos-stream/rpms/conmon.git
synced 2026-05-05 07:52:23 +00:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d6e4068651 | |||
| 4b1b6e1f1b |
@@ -1 +0,0 @@
|
|||||||
1
|
|
||||||
+11
-3
@@ -19,7 +19,7 @@ Epoch: 3
|
|||||||
%else
|
%else
|
||||||
Epoch: 2
|
Epoch: 2
|
||||||
%endif
|
%endif
|
||||||
Version: 2.1.13
|
Version: 2.2.1
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: OCI container runtime monitor
|
Summary: OCI container runtime monitor
|
||||||
@@ -27,13 +27,13 @@ URL: https://github.com/containers/%{name}
|
|||||||
# Tarball fetched from upstream
|
# Tarball fetched from upstream
|
||||||
Source0: %{url}/archive/v%{version}.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: glib2-devel
|
||||||
BuildRequires: libseccomp-devel
|
BuildRequires: libseccomp-devel
|
||||||
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: systemd-devel
|
BuildRequires: systemd-devel
|
||||||
BuildRequires: systemd-libs
|
BuildRequires: systemd-libs
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
@@ -49,7 +49,7 @@ Requires: libseccomp
|
|||||||
sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
|
sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%{__make} DEBUGFLAG="-g" bin/conmon
|
%{__make} DEBUGFLAG="-g" LDFLAGS="-Wl,-z,relro -Wl,-z,now" bin/conmon
|
||||||
|
|
||||||
%if %{with docs}
|
%if %{with docs}
|
||||||
%{__make} GOMD2MAN=go-md2man -C docs
|
%{__make} GOMD2MAN=go-md2man -C docs
|
||||||
@@ -75,6 +75,14 @@ sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
||||||
|
- 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
|
* 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
|
- update to https://github.com/containers/conmon/releases/tag/v2.1.13
|
||||||
- Resolves: RHEL-80818
|
- Resolves: RHEL-80818
|
||||||
|
|||||||
@@ -1,43 +0,0 @@
|
|||||||
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'
|
|
||||||
@@ -1 +1 @@
|
|||||||
SHA512 (v2.1.13.tar.gz) = cb98b26b3c5f5e5f0b09f5373bd58dc958b66ac4edcac2aa509f48be8b7e9a33001428016290944c4002ddbf63e11fb4657aaad879c89c5776f8c8031f4d1d08
|
SHA512 (v2.2.1.tar.gz) = 52513fc25b0db0b7c9c99aa63f6be4c495add350b9269fad67136f728d3399dbb54c5fa526d52c158c67956ded8980f1cc3624fc531a152b16c09caa3399be3b
|
||||||
|
|||||||
Executable
+17
@@ -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
|
||||||
@@ -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
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
- import_playbook: test_podman.yml
|
||||||
Reference in New Issue
Block a user