opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-19 20:23:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5337 from edsantiago/logcollector_include_hostinfo

Browse Source 
CI: package_versions: include hostinfo, kernel
This commit is contained in:
OpenShift Merge Robot
2020-02-27 22:11:37 +01:00
committed by GitHub
parent 3d1af087e6 cabd6c1607
commit be2e5c4b2d
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/cirrus/logcollector.sh
View File

@ -56,6 +56,7 @@ case $1 in
) )
case $OS_RELEASE_ID in case $OS_RELEASE_ID in
fedora*) fedora*)
cat /etc/fedora-release
PKG_LST_CMD='rpm -q --qf=%{N}-%{V}-%{R}-%{ARCH}\n' PKG_LST_CMD='rpm -q --qf=%{N}-%{V}-%{R}-%{ARCH}\n'
PKG_NAMES+=(\ PKG_NAMES+=(\
container-selinux \ container-selinux \
@ -64,6 +65,7 @@ case $1 in
) )
;; ;;
ubuntu*) ubuntu*)
cat /etc/issue
PKG_LST_CMD='dpkg-query --show --showformat=${Package}-${Version}-${Architecture}\n' PKG_LST_CMD='dpkg-query --show --showformat=${Package}-${Version}-${Architecture}\n'
PKG_NAMES+=(\ PKG_NAMES+=(\
cri-o-runc \ cri-o-runc \
@ -71,6 +73,8 @@ case $1 in
;; ;;
*) bad_os_id_ver ;; *) bad_os_id_ver ;;
esac esac
echo "Kernel: " $(uname -r)
echo "Cgroups: " $(stat -f -c %T /sys/fs/cgroup)
# Any not-present packages will be listed as such # Any not-present packages will be listed as such
$PKG_LST_CMD ${PKG_NAMES[@]} | sort -u $PKG_LST_CMD ${PKG_NAMES[@]} | sort -u
;; ;;