From 66fd41ff19b9f248a913f116a39a9165850c1b12 Mon Sep 17 00:00:00 2001
From: Paul Holzinger <pholzing@redhat.com>
Date: Tue, 20 Feb 2024 11:11:46 +0100
Subject: [PATCH] cirrus logcollector: update package list

aardvark-dns, netavark and passt are installed on both debian and
fedora. cri-o-runc is not installed anymore and it just uses the normal
runc package on debian. containers-common is called
golang-github-containers-common on debian and also uses
golang-github-containers-image for further config files from c/image.
This makes sure we correctly log all the package versions on debian
correctly.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
---
 contrib/cirrus/logcollector.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/contrib/cirrus/logcollector.sh b/contrib/cirrus/logcollector.sh
index 074b6743e5..db5d056cb1 100755
--- a/contrib/cirrus/logcollector.sh
+++ b/contrib/cirrus/logcollector.sh
@@ -36,13 +36,15 @@ case $1 in
     packages)
         # These names are common to Fedora and Debian
         PKG_NAMES=(\
+                    aardvark-dns
                     buildah
                     conmon
                     containernetworking-plugins
-                    containers-common
                     criu
                     crun
                     golang
+                    netavark
+                    passt
                     podman
                     runc
                     skopeo
@@ -53,18 +55,17 @@ case $1 in
                 cat /etc/fedora-release
                 PKG_LST_CMD='rpm -q --qf=%{N}-%{V}-%{R}-%{ARCH}\n'
                 PKG_NAMES+=(\
-                    aardvark-dns
                     container-selinux
+                    containers-common
                     libseccomp
-                    netavark
-                    passt
                 )
                 ;;
             debian)
                 cat /etc/issue
                 PKG_LST_CMD='dpkg-query --show --showformat=${Package}-${Version}-${Architecture}\n'
                 PKG_NAMES+=(\
-                    cri-o-runc
+                    golang-github-containers-common
+                    golang-github-containers-image
                     libseccomp2
                 )
                 ;;