summaryrefslogtreecommitdiff
path: root/contrib/cirrus
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2020-02-27 06:04:29 -0700
committerEd Santiago <santiago@redhat.com>2020-02-27 09:40:35 -0700
commitcabd6c160713c35091e39365577bc8a451d03fac (patch)
tree74fc3651a596bd8ad19b48aa620448e96e7e42ab /contrib/cirrus
parentc132a4b7ff1dbe71b70302634fea7dd3b29f76ef (diff)
downloadpodman-cabd6c160713c35091e39365577bc8a451d03fac.tar.gz
podman-cabd6c160713c35091e39365577bc8a451d03fac.tar.bz2
podman-cabd6c160713c35091e39365577bc8a451d03fac.zip
CI: package_versions: include hostinfo, kernel
In the package_versions CI step, include Fedora/Ubuntu version, uname -r, and cgroups version. Cgroups version is simply the FS type of /sys/fs/cgroup, which shows 'tmpfs' for v1 and 'cgroup2fs' for v2. I don't think it's worth the effort to prettify those into 'v1/v2' - I think our readers are sophisticated enough to figure it out from context - but am willing to add that feature if requested. Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'contrib/cirrus')
-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
;;