From 906aecade520822b93fd63fa191e0b5b07fa11ab Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Wed, 24 Jun 2026 17:48:16 +1200 Subject: [PATCH 1/2] Gather agent log bundle In GUI agent-based installs, include the log bundle downloaded from the GUI in the CI artifacts to ease debugging. --- ci-operator/step-registry/agent/gather/agent-gather-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/agent/gather/agent-gather-commands.sh b/ci-operator/step-registry/agent/gather/agent-gather-commands.sh index 7a65b74e2d1f7..fd38e82e9008e 100644 --- a/ci-operator/step-registry/agent/gather/agent-gather-commands.sh +++ b/ci-operator/step-registry/agent/gather/agent-gather-commands.sh @@ -15,7 +15,7 @@ cd dev-scripts make agent_gather EOF -if scp "${SSHOPTS[@]}" "root@${IP}:/root/dev-scripts/agent-gather*.tar.xz" "${ARTIFACT_DIR}/" >& /dev/null ; then +if scp "${SSHOPTS[@]}" "root@${IP}:/root/dev-scripts/agent-gather*.tar.xz" "root@${IP}:/root/dev-scripts/ocp/*/installation-logs.tar" "${ARTIFACT_DIR}/" >& /dev/null ; then echo "agent logs published" fi From 495732e981ee4ec43d0ee6b2aaa6bd5b71eec5f1 Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Wed, 24 Jun 2026 20:29:34 +1200 Subject: [PATCH 2/2] Remove misleading code for retrieving screenshot archive The screenshot archive is retrieved by the scp from the dev-scripts host, by virtue of the filename agent-gather-console-screenshots.tar.xz matching the glob agent-gather*.tar.xz. It is not present in the CI container where the agent-gather-commands.sh script is running, and logs show that the code removed here was not actually running (the log "gathered agent-gather-console-screenshots.tar.xz" does not appear, despite the screenshot archive appearing in the artifacts). --- .../step-registry/agent/gather/agent-gather-commands.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ci-operator/step-registry/agent/gather/agent-gather-commands.sh b/ci-operator/step-registry/agent/gather/agent-gather-commands.sh index fd38e82e9008e..feaa696f56f4e 100644 --- a/ci-operator/step-registry/agent/gather/agent-gather-commands.sh +++ b/ci-operator/step-registry/agent/gather/agent-gather-commands.sh @@ -18,11 +18,3 @@ EOF if scp "${SSHOPTS[@]}" "root@${IP}:/root/dev-scripts/agent-gather*.tar.xz" "root@${IP}:/root/dev-scripts/ocp/*/installation-logs.tar" "${ARTIFACT_DIR}/" >& /dev/null ; then echo "agent logs published" fi - -echo "### Gather console screenshots..." - -screenshot_archive="agent-gather-console-screenshots.tar.xz" -if [ -f "$screenshot_archive" ]; then - cp "$screenshot_archive" "${ARTIFACT_DIR}/" - echo "gathered $screenshot_archive" -fi