TMT: fix plan ref

Upstream tag: v2.2.1
Upstream commit: c8cc2c4d

Commit authored by Packit automation (https://packit.dev/)

.fmf/version

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

.gitignore

@@ -117,3 +117,8 @@
 /v2.1.6.tar.gz
 /v2.1.7.tar.gz
 /v2.1.8.tar.gz
+/v2.1.10.tar.gz
+/v2.1.12.tar.gz
+/v2.1.13.tar.gz
+/v2.2.0.tar.gz
+/v2.2.1.tar.gz

.packit.yaml

@@ -0,0 +1,89 @@
+---
+# See the documentation for more information:
+# https://packit.dev/docs/configuration/
+
+downstream_package_name: conmon
+upstream_tag_template: v{version}
+
+packages:
+  conmon-fedora:
+    pkg_tool: fedpkg
+    specfile_path: rpm/conmon.spec
+  conmon-centos:
+    pkg_tool: centpkg
+    specfile_path: rpm/conmon.spec
+  conmon-rhel:
+    specfile_path: rpm/conmon.spec
+
+jobs:
+  - job: copr_build
+    trigger: pull_request
+    packages: [conmon-fedora]
+    notifications: &copr_build_failure_notification
+      failure_comment:
+        message: "Ephemeral COPR build failed. @containers/packit-build please check."
+    enable_net: true
+    targets:
+      - fedora-all-aarch64
+      - fedora-all-x86_64
+      - fedora-eln-aarch64
+      - fedora-eln-x86_64
+
+  - job: copr_build
+    trigger: pull_request
+    packages: [conmon-centos]
+    notifications: *copr_build_failure_notification
+    enable_net: true
+    targets:
+      - centos-stream-10-aarch64
+      - centos-stream-10-x86_64
+      - centos-stream-9-aarch64
+      - centos-stream-9-x86_64
+
+  - job: copr_build
+    trigger: pull_request
+    packages: [conmon-rhel]
+    notifications: *copr_build_failure_notification
+    enable_net: true
+    targets:
+      - epel-9-aarch64
+      - epel-9-x86_64
+
+  # Run on commit to main branch
+  - job: copr_build
+    trigger: commit
+    notifications:
+      failure_comment:
+        message: "podman-next COPR build failed. @containers/packit-build please check."
+    branch: main
+    owner: rhcontainerbot
+    project: podman-next
+    enable_net: true
+
+  # Downstream sync for Fedora
+  - job: propose_downstream
+    trigger: release
+    packages: [conmon-fedora]
+    update_release: false
+    dist_git_branches:
+      - fedora-all
+
+  # Downstream sync for CentOS Stream
+  - job: propose_downstream
+    trigger: release
+    packages: [conmon-centos]
+    update_release: false
+    dist_git_branches:
+      - c10s
+
+  - job: koji_build
+    trigger: commit
+    packages: [conmon-fedora]
+    dist_git_branches:
+      - fedora-all
+
+  - job: bodhi_update
+    trigger: commit
+    packages: [conmon-fedora]
+    dist_git_branches:
+      - fedora-branched # rawhide updates are created automatically

README.packit

@@ -0,0 +1,3 @@
+This repository is maintained by packit.
+https://packit.dev/
+The file was generated using packit 1.14.0.post1.dev10+g291d7454f.

conmon.spec

@@ -7,33 +7,33 @@
 %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.2.1
 License: Apache-2.0
 Release: %autorelease
 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
 %endif
 BuildRequires: gcc
 BuildRequires: git-core
 BuildRequires: glib2-devel
 BuildRequires: libseccomp-devel
+BuildRequires: pkgconfig
 BuildRequires: systemd-devel
 BuildRequires: systemd-libs
 BuildRequires: make
@@ -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,8 +69,6 @@ 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

gating.yaml

@@ -1,14 +1,16 @@
 --- !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}
+
 --- !Policy
 product_versions:
-  - fedora-*
+  - rhel-*
-decision_context: bodhi_update_push_testing
+decision_context: osci_compose_gate
-subject_type: koji_build
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

plans/podman.fmf

@@ -0,0 +1,44 @@
+prepare:
+    - when: distro == centos-stream or distro == rhel
+      how: shell
+      script: |
+        dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-$(rpm --eval '%{?rhel}').noarch.rpm
+        dnf -y config-manager --set-enabled epel
+      order: 10
+    - when: initiator == packit
+      how: shell
+      script: |
+        COPR_REPO_FILE="/etc/yum.repos.d/*podman-next*.repo"
+        if compgen -G $COPR_REPO_FILE > /dev/null; then
+            sed -i -n '/^priority=/!p;$apriority=1' $COPR_REPO_FILE
+        fi
+        dnf -y upgrade --allowerasing
+      order: 20
+
+provision:
+    how: artemis
+    hardware:
+        memory: ">= 16 GB"
+        cpu:
+            cores: ">= 4"
+            threads: ">=8"
+        disk:
+            - size: ">= 512 GB"
+
+discover:
+    how: fmf
+    url: https://github.com/containers/podman
+    ref: "v5.8.0"
+
+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.2.1.tar.gz) = 52513fc25b0db0b7c9c99aa63f6be4c495add350b9269fad67136f728d3399dbb54c5fa526d52c158c67956ded8980f1cc3624fc531a152b16c09caa3399be3b

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