From 3d488385ff53b2495aea6dd4f18c97b52eac0425 Mon Sep 17 00:00:00 2001
From: Major Hayden <major@redhat.com>
Date: Wed, 10 Jun 2020 16:06:41 -0500
Subject: [PATCH] Gather compose log/metadata for AWS/qemu test

Gather logs directly for AWS + qemu tests using `composer-cli compose
log` and also gather the metadata. This will hopefully help diagnost the
problems we are seeing in #754.

Signed-off-by: Major Hayden <major@redhat.com>
---
 test/image-tests/aws.sh  | 31 +++++++++++++++++++++++++++++++
 test/image-tests/qemu.sh | 33 +++++++++++++++++++++------------
 2 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/test/image-tests/aws.sh b/test/image-tests/aws.sh
index a03786bbb..e33d39247 100755
--- a/test/image-tests/aws.sh
+++ b/test/image-tests/aws.sh
@@ -69,6 +69,32 @@ smoke_test_check () {
     fi
 }
 
+# Get the compose log.
+get_compose_log () {
+    COMPOSE_ID=$1
+    LOG_FILE=${WORKSPACE}/osbuild-${ID}-${VERSION_ID}-aws.log
+
+    # Download the logs.
+    sudo composer-cli compose log $COMPOSE_ID | tee $LOG_FILE > /dev/null
+}
+
+# Get the compose metadata.
+get_compose_metadata () {
+    COMPOSE_ID=$1
+    METADATA_FILE=${WORKSPACE}/osbuild-${ID}-${VERSION_ID}-aws.log
+
+    # Download the metadata.
+    sudo composer-cli compose metadata $COMPOSE_ID > /dev/null
+
+    # Find the tarball and extract it.
+    TARBALL=$(basename $(find . -maxdepth 1 -type f -name "*-metadata.tar"))
+    tar -xf $TARBALL
+    rm -f $TARBALL
+
+    # Move the JSON file into place.
+    cat ${COMPOSE_ID}.json | jq -M '.' | tee $METADATA_FILE > /dev/null
+}
+
 # Get the console screenshot from the AWS instance.
 store_instance_screenshot () {
     INSTANCE_ID=${1}
@@ -143,6 +169,11 @@ while true; do
     sleep 30
 done
 
+# Capture the compose logs from osbuild.
+greenprint "💬 Getting compose log and metadata"
+get_compose_log $COMPOSE_ID
+get_compose_metadata $COMPOSE_ID
+
 # Did the compose finish with success?
 if [[ $COMPOSE_STATUS != FINISHED ]]; then
     echo "Something went wrong with the compose. 😢"
diff --git a/test/image-tests/qemu.sh b/test/image-tests/qemu.sh
index 9786351f4..9bb742152 100755
--- a/test/image-tests/qemu.sh
+++ b/test/image-tests/qemu.sh
@@ -92,22 +92,30 @@ smoke_test_check () {
     fi
 }
 
-# Get the compose logs and store them as artifacts.
-get_compose_logs () {
+# Get the compose log.
+get_compose_log () {
     COMPOSE_ID=$1
+    LOG_FILE=${WORKSPACE}/osbuild-${ID}-${VERSION_ID}-aws.log
 
     # Download the logs.
-    sudo composer-cli compose logs $COMPOSE_ID
+    sudo composer-cli compose log $COMPOSE_ID | tee $LOG_FILE > /dev/null
+}
 
-    # Find the log tarball and extract it.
-    LOG_TAR=$(basename $(find . -maxdepth 1 -type f -name "*logs.tar"))
-    tar xf $LOG_TAR
+# Get the compose metadata.
+get_compose_metadata () {
+    COMPOSE_ID=$1
+    METADATA_FILE=${WORKSPACE}/osbuild-${ID}-${VERSION_ID}-aws.log
 
-    # Move the log into the workspace so it can be artifacted.
-    mv logs/osbuild.log ${WORKSPACE}/osbuild-${ID}-${VERSION_ID}-${IMAGE_TYPE}.log
+    # Download the metadata.
+    sudo composer-cli compose metadata $COMPOSE_ID > /dev/null
 
-    # Clean up.
-    rm -rf $LOG_TAR logs
+    # Find the tarball and extract it.
+    TARBALL=$(basename $(find . -maxdepth 1 -type f -name "*-metadata.tar"))
+    tar -xf $TARBALL
+    rm -f $TARBALL
+
+    # Move the JSON file into place.
+    cat ${COMPOSE_ID}.json | jq -M '.' | tee $METADATA_FILE > /dev/null
 }
 
 # Write a basic blueprint for our image.
@@ -170,8 +178,9 @@ while true; do
 done
 
 # Capture the compose logs from osbuild.
-greenprint "💬 Getting logs for compose"
-get_compose_logs $COMPOSE_ID
+greenprint "💬 Getting compose log and metadata"
+get_compose_log $COMPOSE_ID
+get_compose_metadata $COMPOSE_ID
 
 # Did the compose finish with success?
 if [[ $COMPOSE_STATUS != FINISHED ]]; then