From 0b5100ff79c422bf21d9ecc25107be9150881ca7 Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Mon, 30 Sep 2019 17:25:30 -0400
Subject: Cirrus: Show names/versions of critical packages

Adds an output to all testing tasks which lists the names/versions of
critical/essential packages present on the VM.

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 .cirrus.yml                    |  1 +
 contrib/cirrus/logcollector.sh | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/.cirrus.yml b/.cirrus.yml
index 5d810fa65..7f295e22e 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -363,6 +363,7 @@ testing_task:
         failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh'
 
     always: &standardlogs
+        package_versions_script: '$SCRIPT_BASE/logcollector.sh packages'
         ginkgo_node_logs_script: '$SCRIPT_BASE/logcollector.sh ginkgo'
         df_script: '$SCRIPT_BASE/logcollector.sh df'
         audit_log_script: '$SCRIPT_BASE/logcollector.sh audit'
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
-- 
cgit v1.2.3-54-g00ecf