summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-10-01 08:42:04 -0700
committerGitHub <noreply@github.com>2019-10-01 08:42:04 -0700
commit7e47abe1f71c90d602fdd153e84e119743763f45 (patch)
treea43883436c7ebf43329e87b878156049f1a5edf5
parent8f2ec8813d84e2b68f63d21573ac8da15d01f9f9 (diff)
parent0b5100ff79c422bf21d9ecc25107be9150881ca7 (diff)
downloadpodman-7e47abe1f71c90d602fdd153e84e119743763f45.tar.gz
podman-7e47abe1f71c90d602fdd153e84e119743763f45.tar.bz2
podman-7e47abe1f71c90d602fdd153e84e119743763f45.zip
Merge pull request #4154 from cevich/show_packages
Cirrus: Show names/versions of critical packages
-rw-r--r--.cirrus.yml1
-rwxr-xr-xcontrib/cirrus/logcollector.sh37
2 files changed, 38 insertions, 0 deletions
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