From 5756fd8ff9a2c1e126cbfba07d519c2935c8dd32 Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Thu, 3 Oct 2019 15:49:37 -0400
Subject: Cirrus: Simplify package NVR logging

Also include runc/crun version for Fedora

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 contrib/cirrus/logcollector.sh | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/contrib/cirrus/logcollector.sh b/contrib/cirrus/logcollector.sh
index 3393ac9b5..b0a644f8c 100755
--- a/contrib/cirrus/logcollector.sh
+++ b/contrib/cirrus/logcollector.sh
@@ -33,40 +33,35 @@ case $1 in
     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 \
+        # These names are common to Fedora and Ubuntu
+        PKG_NAMES=(\
+                    conmon \
                     containernetworking-plugins \
                     containers-common \
                     criu \
                     golang \
                     podman \
+                    skopeo \
                     slirp4netns \
+        )
+        case $OS_RELEASE_ID in
+            fedora*)
+                PKG_LST_CMD='rpm -q --qf=%{N}-%{V}-%{R}-%{ARCH}\n'
+                PKG_NAMES+=(\
+                    container-selinux \
+                    crun \
+                    runc \
                 )
-                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 \
+                PKG_NAMES+=(\
                     cri-o-runc \
-                    criu \
-                    golang \
-                    libvarlink \
-                    podman \
-                    skopeo \
-                    slirp4netns \
                 )
                 ;;
             *) bad_os_id_ver ;;
         esac
+        # Any not-present packages will be listed as such
         $PKG_LST_CMD ${PKG_NAMES[@]} | sort -u
         ;;
     *) die 1 "Warning, $(basename $0) doesn't know how to handle the parameter '$1'"
-- 
cgit v1.2.3-54-g00ecf