1 files changed, 37 insertions, 0 deletions
diff --git a/contrib/cirrus/logcollector.sh b/contrib/cirrus/logcollector.sh
index 425a619b0..3393ac9b5 100755
--- a/contrib/cirrus/logcollector.sh
+++ b/contrib/cirrus/logcollector.sh
@@ -32,5 +32,42 @@ case $1 in
     df) showrun df -lhTx tmpfs ;;
     ginkgo) showrun cat $CIRRUS_WORKING_DIR/test/e2e/ginkgo-node-*.log ;;
     journal) showrun journalctl -b ;;
+    packages)
+        case $OS_RELEASE_ID in
+            fedora*)
+                PKG_LST_CMD='rpm -q --qf=%{N}-%{V}-%{R}-%{ARCH}\n'
+                PKG_NAMES=(\
+                    container-selinux \
+                    containernetworking-plugins \
+                    containers-common \
+                    criu \
+                    golang \
+                    podman \
+                    slirp4netns \
+                )
+                if [[ "$OS_RELEASE_VER" -lt "31" ]]; then
+                    PKG_NAMES+=(runc)
+                else
+                    PKG_NAMES+=(crun)
+                fi
+                ;;
+            ubuntu*)
+                PKG_LST_CMD='dpkg-query --show --showformat=${Package}-${Version}-${Architecture}\n'
+                PKG_NAMES=(\
+                    containernetworking-plugins \
+                    containers-common \
+                    cri-o-runc \
+                    criu \
+                    golang \
+                    libvarlink \
+                    podman \
+                    skopeo \
+                    slirp4netns \
+                )
+                ;;
+            *) bad_os_id_ver ;;
+        esac
+        $PKG_LST_CMD ${PKG_NAMES[@]} | sort -u
+        ;;
     *) die 1 "Warning, $(basename $0) doesn't know how to handle the parameter '$1'"
 esac