diff --git a/hack/ci/logcollector.sh b/hack/ci/logcollector.sh index dbab1d9a6c..c77cbe09ea 100755 --- a/hack/ci/logcollector.sh +++ b/hack/ci/logcollector.sh @@ -57,6 +57,7 @@ packages) PKG_NAMES+=( container-selinux containers-common + conmon-v3 libseccomp ) ;; diff --git a/hack/ci/runner.sh b/hack/ci/runner.sh index a5949df726..82e11352bc 100755 --- a/hack/ci/runner.sh +++ b/hack/ci/runner.sh @@ -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) ;;