Merge pull request #16534 from edsantiago/early_package_versions

[CI:DOCS] CI: Package versions: run in the 'main' step
containers · Nov 17, 2022 · 639efd8 · 639efd8
2 parents 54b1fd3 + 34020b3
commit 639efd8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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}"