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

Draft: [c9s] TMT: fetch tests from upstream

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

.fmf/version

@@ -1 +1 @@
-1
+1

.gitignore

@@ -1,124 +1 @@
-/conmon-e217fdf.tar.gz
-/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
-/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
+/*.tar.gz

.packit.yaml

@@ -1,89 +0,0 @@
----
-# 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.md

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

README.packit

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

conmon.spec

@@ -1,66 +1,43 @@
-%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
+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: git
 BuildRequires: glib2-devel
-BuildRequires: libseccomp-devel
-BuildRequires: pkgconfig
 BuildRequires: systemd-devel
-BuildRequires: systemd-libs
-BuildRequires: make
-Requires: glib2
-Requires: systemd-libs
-Requires: libseccomp
+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} DEBUGFLAG="-g" bin/conmon
-
-%if %{with docs}
-%{__make} 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
-
-%if %{with docs}
-%{__make} PREFIX=%{buildroot}%{_prefix} -C docs install
-%endif
+%{__make} PREFIX=%{buildroot}%{_prefix} install
 
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
@@ -69,10 +46,7 @@ sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
 %license LICENSE
 %doc README.md
 %{_bindir}/%{name}
-
-%if %{with docs}
-%{_mandir}/man8/%{name}.8.gz
-%endif
+%{_mandir}/man8/*
 
 %changelog
 %autochangelog

gating.yaml

@@ -1,10 +1,7 @@
 --- !Policy
 product_versions:
   - fedora-*
-decision_contexts:
-  - bodhi_update_push_stable
-  - bodhi_update_push_testing
-subject_type: koji_build
+decision_context: bodhi_update_push_stable
 rules:
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
 

plans/podman.fmf

@@ -1,44 +0,0 @@
-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.2.1.tar.gz) = 52513fc25b0db0b7c9c99aa63f6be4c495add350b9269fad67136f728d3399dbb54c5fa526d52c158c67956ded8980f1cc3624fc531a152b16c09caa3399be3b
+SHA512 (v2.1.12.tar.gz) = 06668aa35f5752e3d383f0a2cdf88f7c5056bdef96756aa230279ae25ef1d6b6bfd14888d35907062404670ae85d71d2d7258577abff70b74fa49bff6c2d9d20