From 4fb1d4cd9e5fc842f5ac555dfd9f92260c30f865 Mon Sep 17 00:00:00 2001
From: Petr Šplíchal <psplicha@redhat.com>
Date: May 20 2019 14:37:34 +0000
Subject: Include logs in results.yml, use consistent prefix


Include all log file names in the results.yml file.
Prefix all log files so that investigation is easier.

---

diff --git a/roles/standard-test-basic/files/run-basic-test b/roles/standard-test-basic/files/run-basic-test
index 5be3556..108ff2f 100755
--- a/roles/standard-test-basic/files/run-basic-test
+++ b/roles/standard-test-basic/files/run-basic-test
@@ -116,15 +116,22 @@ clean_exit() {
     fi
     local run_journal="$STR_ARTIFACTS_DIR/test.log"
     echo "${status} $STR_TEST_NAME" >> "$run_journal"
-    # Handle results.yml file
+    # Handle results.yml file, rename logs
     local results="$STR_ARTIFACTS_DIR/results.yml"
     local result=$(echo $status | tr '[:upper:]' '[:lower:]')
     test -f "$results" || echo 'results:' > "$results"
-    echo "- {result: $result, test: $STR_TEST_NAME}" >> "$results"
-    if [ -e "$logfile_stdout" ]; then
-        local new_logfile_stdout="$(dirname "$logfile_stdout")/${status}_$(basename "$logfile_stdout")"
-        mv -f "$logfile_stdout" "$new_logfile_stdout"
-    fi
+    printf '%s\n' '' \
+        "- test: $STR_TEST_NAME" \
+        "  result: $result"      \
+        "  logs:"  \
+        >> "$results"
+    for log in "$logfile_stdout" "$logfile_stderr"; do
+        if [ -f "$log" ]; then
+            local prefixed_log="$STR_ARTIFACTS_DIR/${status}-$(basename $log)"
+            mv -f "$log" "$prefixed_log"
+            echo "  - $(basename $prefixed_log)" >> "$results"
+        fi
+    done
     exit 0
 }
 trap clean_exit SIGINT SIGTERM SIGABRT EXIT
diff --git a/roles/standard-test-beakerlib/files/run-beakerlib-test b/roles/standard-test-beakerlib/files/run-beakerlib-test
index a46bf4b..a68fd8f 100755
--- a/roles/standard-test-beakerlib/files/run-beakerlib-test
+++ b/roles/standard-test-beakerlib/files/run-beakerlib-test
@@ -115,12 +115,22 @@ clean_exit() {
         status="ERROR"
     fi
     echo "$status $STR_BKR_TEST" >> "$STR_ARTIFACTS_DIR/test.log"
-    mv "$log_file_path" "$STR_ARTIFACTS_DIR/${status}_${log_file_name}"
-    # Handle results.yml file
+    # Handle results.yml file, rename logs
     local results="$STR_ARTIFACTS_DIR/results.yml"
     local result=$(echo $status | tr '[:upper:]' '[:lower:]')
     test -f "$results" || echo 'results:' > "$results"
-    echo "- {result: $result, test: $STR_BKR_TEST}" >> "$results"
+    printf '%s\n' '' \
+        "- test: $STR_BKR_TEST" \
+        "  result: $result"      \
+        "  logs:"  \
+        >> "$results"
+    for log in "$log_file_path" "$OUTPUTFILE" "$logfile_stdout" "$logfile_stderr"; do
+        if [ -f "$log" ]; then
+            local prefixed_log="$STR_ARTIFACTS_DIR/${status}-$(basename $log)"
+            mv -f "$log" "$prefixed_log"
+            echo "  - $(basename $prefixed_log)" >> "$results"
+        fi
+    done
     # Exit code == 0, no matter of the test result.
     exit 0
 }