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

Merge pull request #4186 from cevich/log_runc_crun

Browse Source 
Cirrus: Simplify package NVR logging
This commit is contained in:
OpenShift Merge Robot
2019-10-04 07:42:05 -07:00
committed by GitHub
parent c9e936a407 5756fd8ff9
commit 70d5b0a6fb
1 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
contrib/cirrus/logcollector.sh
View File

@ -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 \
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 \
)
case $OS_RELEASE_ID in
fedora*)
PKG_LST_CMD='rpm -q --qf=%{N}-%{V}-%{R}-%{ARCH}\n'
PKG_NAMES+=(\
container-selinux \
crun \
runc \
)
;;
ubuntu*)
PKG_LST_CMD='dpkg-query --show --showformat=${Package}-${Version}-${Architecture}\n'
PKG_NAMES+=(\
cri-o-runc \
)
;;
*) 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'"