Add support for sending failed logs to logdetective

New function called 'analyze_logs_by_logdetective()' is
used as for 'build' part as for 'test' part.

Each function is marked by 'LOGDETECTIVE {BUILD|TEST} tag
so we can easily find them.

Also parsing logs have been enhanced no parse_output is needed.
Let's call it directly.
It is used on Fedora. We use podman for building
and there is no needed to use complicated functions.

Signed-off-by: Petr "Stone" Hracek <[email protected]>

Author: phracek

build.sh

@@ -65,6 +65,17 @@ parse_output ()
   (exit $rc)
 }
 
+analyze_logs_by_logdetective() {
+  local result="$1"
+  local log_file_name="$2"
+  if [[ "$result" != "0" ]]; then
+    echo "Sending log file to logdetective server: ${log_file_name}"
+    echo "-------- LOGDETECTIVE BUILD LOG ANALYSIS START --------"
+    logdetective "${log_file_name}"
+    echo "-------- LOGDETECTIVE BUILD LOG ANALYSIS FINISHED --------"
+  fi
+}
+
 # "best-effort" cleanup of image
 function clean_image {
   for id_file in .image-id .image-id-from; do
@@ -191,10 +202,35 @@ function docker_build_with_version {
   if [[ "$SKIP_SQUASH" -eq 0 ]] && [[ "$is_podman" -eq 1 ]]; then
     BUILD_OPTIONS+=" --squash"
   fi
+
+  command="docker build "$BUILD_OPTIONS" -f $dockerfile ${DOCKER_BUILD_CONTEXT}"
+  echo "-> building using $command"
+
+  tmp_file=$(mktemp "/tmp/${dir}-${OS}.XXXXXX")
+  $command 2>&1 | tee "$tmp_file" #> $tmp_file 2>&1
+  cat $tmp_file
+  last_row=$(cat $tmp_file | tail -n 1)
+  # Structure of log build is following:
+  # COMMIT
+  # --> e191d12b5928
+  # e191d12b5928360dd6024fe80d31e08f994d42577f76b9b143e014749afc8ab4
   # shellcheck disable=SC2016
-  parse_output 'docker build '"$BUILD_OPTIONS"' -f "$dockerfile" "${DOCKER_BUILD_CONTEXT}"' \
-               "tail -n 1 | awk '/Successfully built|(^--> )?(Using cache )?[a-fA-F0-9]+$/{print \$NF}'" \
-               IMAGE_ID
+  if [[ "$(cat $tmp_file | tail -n 3)" == *"COMMIT"* ]] && [[ "$last_row" =~ (^-->)?(Using cache )?[a-fA-F0-9]+$ ]]; then
+    IMAGE_ID="$last_row"
+  else
+    echo "Analyse logs by logdetective, why it failed."
+    analyze_logs_by_logdetective "1" "${tmp_file}"
+    exit 1
+  fi
+
+  rm -f "$tmp_file"
+
+  # shellcheck disable=SC2016
+
+#  parse_output 'docker build '"$BUILD_OPTIONS"' -f "$dockerfile" "${DOCKER_BUILD_CONTEXT}"' \
+#               "tail -n 1 | awk '/Successfully built|(^--> )?(Using cache )?[a-fA-F0-9]+$/{print \$NF}'" \
+#               IMAGE_ID
+#  analyze_logs_by_logdetective "$?" "${tmp_file}"
   echo "$IMAGE_ID" > .image-id
 }
 

test.sh

@@ -24,6 +24,17 @@ failed_version() {
   return "$result"
 }
 
+analyze_logs_by_logdetective() {
+  local result="$1"
+  local log_file_name="$2"
+  if [[ "$result" != "0" ]]; then
+    echo "Sending log file to logdetective server: ${log_file_name}"
+    echo "-------- LOGDETECTIVE TEST LOG ANALYSIS START --------"
+    logdetective "${log_file_name}"
+    echo "-------- LOGDETECTIVE TEST LOG ANALYSIS FINISHED --------"
+  fi
+}
+
 # This adds backwards compatibility if only single version needs to be testing
 # In CI we would like to test single version but VERSIONS= means, that nothing is tested
 # make test TARGET=<OS> VERSIONS=<something> ... checks single version for CLI
@@ -47,8 +58,12 @@ for dir in ${VERSIONS}; do
   fi
 
   if [ -n "${TEST_MODE}" ]; then
-    VERSION=$dir test/run
-    failed_version "$?" "$dir"
+    tmp_file=$(mktemp "/tmp/${IMAGE_NAME}-${OS}-${dir}.XXXXXX")
+    VERSION=$dir test/run 2>&1 | tee $tmp_file
+    ret_code=$?
+    analyze_logs_by_logdetective "$ret_code" "$tmp_file"
+    failed_version "$ret_code" "$dir"
+    rm -f "$tmp_file"
   fi
 
   if [ -n "${TEST_OPENSHIFT_4}" ]; then