From d06092705005fe0e86737f31f2826f8cac247b85 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 14 Apr 2021 08:54:34 -0400
Subject: [PATCH] gather/aws-console: Make log gathering non-fatal

Something in our console content is either UTF-8 and this is
expecting ASCII, or is invalid UTF-8.  To unblock RHCOS
promotion jobs, make gathering the console non-fatal.
---
 .../gather/aws-console/gather-aws-console-commands.sh          | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ci-operator/step-registry/gather/aws-console/gather-aws-console-commands.sh b/ci-operator/step-registry/gather/aws-console/gather-aws-console-commands.sh
index 8371d267b5fa..d8a62eab6024 100755
--- a/ci-operator/step-registry/gather/aws-console/gather-aws-console-commands.sh
+++ b/ci-operator/step-registry/gather/aws-console/gather-aws-console-commands.sh
@@ -35,6 +35,5 @@ REGION="$(jq -r .aws.region "${SHARED_DIR}/metadata.json")"
 cat "${TMPDIR}/node-provider-IDs.txt" | sort | uniq | while read -r INSTANCE_ID
 do
 	echo "Gathering console logs for ${INSTANCE_ID}"
-	aws --region "${REGION}" ec2 get-console-output --instance-id "${INSTANCE_ID}" --output text > "${ARTIFACT_DIR}/${INSTANCE_ID}" &
-	wait "$!"
+	aws --region "${REGION}" ec2 get-console-output --instance-id "${INSTANCE_ID}" --output text > "${ARTIFACT_DIR}/${INSTANCE_ID}" || echo "Failed to gather console logs"
 done