summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-02-27 22:11:37 +0100
committerGitHub <noreply@github.com>2020-02-27 22:11:37 +0100
commitbe2e5c4b2dd9b8d0c80593f9c6f2f0d15bf7e430 (patch)
tree7a161594fbb78348d8cae6ff4339928c8bc321ac
parent3d1af087e6beba5ac31e2c6758fd5696d6d7883f (diff)
parentcabd6c160713c35091e39365577bc8a451d03fac (diff)
downloadpodman-be2e5c4b2dd9b8d0c80593f9c6f2f0d15bf7e430.tar.gz
podman-be2e5c4b2dd9b8d0c80593f9c6f2f0d15bf7e430.tar.bz2
podman-be2e5c4b2dd9b8d0c80593f9c6f2f0d15bf7e430.zip
Merge pull request #5337 from edsantiago/logcollector_include_hostinfo
CI: package_versions: include hostinfo, kernel
-rwxr-xr-xcontrib/cirrus/logcollector.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/contrib/cirrus/logcollector.sh b/contrib/cirrus/logcollector.sh
index 1769e9362..34b88e6ea 100755
--- a/contrib/cirrus/logcollector.sh
+++ b/contrib/cirrus/logcollector.sh
@@ -56,6 +56,7 @@ case $1 in
)
case $OS_RELEASE_ID in
fedora*)
+ cat /etc/fedora-release
PKG_LST_CMD='rpm -q --qf=%{N}-%{V}-%{R}-%{ARCH}\n'
PKG_NAMES+=(\
container-selinux \
@@ -64,6 +65,7 @@ case $1 in
)
;;
ubuntu*)
+ cat /etc/issue
PKG_LST_CMD='dpkg-query --show --showformat=${Package}-${Version}-${Architecture}\n'
PKG_NAMES+=(\
cri-o-runc \
@@ -71,6 +73,8 @@ case $1 in
;;
*) bad_os_id_ver ;;
esac
+ echo "Kernel: " $(uname -r)
+ echo "Cgroups: " $(stat -f -c %T /sys/fs/cgroup)
# Any not-present packages will be listed as such
$PKG_LST_CMD ${PKG_NAMES[@]} | sort -u
;;