diff options
| author | Brent Baude <bbaude@redhat.com> | 2020-10-05 08:42:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-05 08:42:15 -0500 |
| commit | caace52d54c846c948c88a62f973f4d11808532e (patch) | |
| tree | 41ef903d08193a4f6ff0edba9727f54a1e0583d5 /contrib/cirrus/logcollector.sh | |
| parent | 436dda23852a367807d86e98b7a59f09a82c1802 (diff) | |
| parent | 2c9084e2245834094e14e9105e64b6062d70a0f1 (diff) | |
| download | podman-caace52d54c846c948c88a62f973f4d11808532e.tar.gz podman-caace52d54c846c948c88a62f973f4d11808532e.tar.bz2 podman-caace52d54c846c948c88a62f973f4d11808532e.zip | |
Merge pull request #6784 from cevich/new_ci_cd
Cirrus: Make efficient and performant
Diffstat (limited to 'contrib/cirrus/logcollector.sh')
| -rwxr-xr-x | contrib/cirrus/logcollector.sh | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/contrib/cirrus/logcollector.sh b/contrib/cirrus/logcollector.sh index fd5017b44..9dcc252c0 100755 --- a/contrib/cirrus/logcollector.sh +++ b/contrib/cirrus/logcollector.sh @@ -2,9 +2,10 @@ set -e +# shellcheck source=contrib/cirrus/lib.sh source $(dirname $0)/lib.sh -req_env_var CIRRUS_WORKING_DIR OS_RELEASE_ID RCLI +req_env_vars CIRRUS_WORKING_DIR OS_RELEASE_ID # Assume there are other log collection commands to follow - Don't # let one break another that may be useful, but also keep any @@ -33,14 +34,9 @@ case $1 in ginkgo) showrun cat $CIRRUS_WORKING_DIR/test/e2e/ginkgo-node-*.log ;; journal) showrun journalctl -b ;; podman) showrun ./bin/podman system info ;; - varlink) - if [[ "$RCLI" == "true" ]] - then - echo "(Trailing 100 lines of $VARLINK_LOG)" - showrun tail -100 $VARLINK_LOG - else - die 0 "\$RCLI is not 'true': $RCLI" - fi + server) + msg "(Trailing 100 lines of $PODMAN_SERVER_LOG)" + if [[ -r "$PODMAN_SERVER_LOG" ]]; then tail -100 $PODMAN_SERVER_LOG; fi ;; packages) # These names are common to Fedora and Ubuntu @@ -78,7 +74,7 @@ case $1 in 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 + $PKG_LST_CMD "${PKG_NAMES[@]}" | sort -u ;; - *) die 1 "Warning, $(basename $0) doesn't know how to handle the parameter '$1'" + *) die "Warning, $(basename $0) doesn't know how to handle the parameter '$1'" esac |