CI: default Rawhide to the image's conmon-v3

On fedora-rawhide, write containers.conf.d so engine.conmon_path is
/usr/bin/conmon-v3 and export CONMON_BINARY to that same binary, which
is already installed in the CI image. Preserve CONMON_BINARY across
sudo, and abort setup unless the binary reports conmon version 3.
Also collect the conmon-v3 package when CI gathers logs.

Signed-off-by: Jan Kaluza <jkaluza@redhat.com>
This commit is contained in:
Jan Kaluza committed 2026-10-15 14:37:46 +02:00
1 parent f15bf2be6f
commit e07547aaa7
2 files changed
+16 -1

No files matched your search

+1
View File
@@ -57,6 +57,7 @@ packages)
PKG_NAMES+=(
container-selinux
containers-common
conmon-v3
libseccomp
)
;;
+15 -1
View File
@@ -13,7 +13,7 @@ echo "::group::Test Setup"
parse_args "$@"
PRESERVE_ENVS="PODMAN_CI,CI_USE_REGISTRY_CACHE,CI_DESIRED_COMPOSEFS,CI_DESIRED_STORAGE,OCI_RUNTIME,CGROUP_MANAGER,STORAGE_OPTIONS_OVERLAY,STORAGE_OPTIONS_VFS,PODMAN_UPGRADE_FROM"
PRESERVE_ENVS="PODMAN_CI,CI_USE_REGISTRY_CACHE,CI_DESIRED_COMPOSEFS,CI_DESIRED_STORAGE,OCI_RUNTIME,CGROUP_MANAGER,STORAGE_OPTIONS_OVERLAY,STORAGE_OPTIONS_VFS,PODMAN_UPGRADE_FROM,CONMON_BINARY"
# run as root or or not
SUDO=""
if [[ "$PRIV" == "root" ]]; then
@@ -33,6 +33,20 @@ fedora-rawhide)
CI_DESIRED_COMPOSEFS="composefs"
# Enable sequoia testing
TEST_BUILD_TAGS="containers_image_sequoia"
# Use conmon-v3 already present in the Rawhide CI image as the default
# (https://github.com/containers/conmon-v3).
sudo mkdir -p /etc/containers/containers.conf.d
sudo tee /etc/containers/containers.conf.d/90-conmon-v3.conf << EOF
[engine]
conmon_path = [
"/usr/bin/conmon-v3"
]
EOF
export CONMON_BINARY=/usr/bin/conmon-v3
version=$("$CONMON_BINARY" --version)
echo "$version"
grep -qE '^conmon version 3(\.|$)' <<< "$version"
;;
debian-sid)
;;