diff --git a/.cirrus.yml b/.cirrus.yml index d1e69c0da6..3dce0a6344 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -306,7 +306,6 @@ bindings_task: html_artifacts: path: ./*.html type: text/html - package_versions_script: '$SCRIPT_BASE/logcollector.sh packages' df_script: '$SCRIPT_BASE/logcollector.sh df' audit_log_script: '$SCRIPT_BASE/logcollector.sh audit' journal_script: '$SCRIPT_BASE/logcollector.sh journal' diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index 9ece41e0ed..1c9d565fb6 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -497,6 +497,12 @@ if [[ "$PRIV_NAME" == "rootless" ]] && [[ "$UID" -eq 0 ]]; then fi # else: not running rootless, do nothing special +# Dump important package versions. Before 2022-11-16 this took place as +# a separate .cirrus.yml step, but it really belongs here. +$(dirname $0)/logcollector.sh packages +msg "************************************************************" + + cd "${GOSRC}/" handler="_run_${TEST_FLAVOR}"