Update validate.sh to have proper centralized cleanup that will prevent disk space issues

Signed-off-by: Teoh Suh Haw <suh.haw.teoh@intel.com>

Author: elvin03

validate.sh

@@ -36,6 +36,27 @@ else
   echo "QEMU boot tests will be skipped"
 fi
 
+# Centralized cleanup function for image files
+cleanup_image_files() {
+  local cleanup_type="${1:-all}"  # Options: all, raw, extracted
+  
+  case "$cleanup_type" in
+    "raw")
+      echo "Cleaning up raw image files from build directories..."
+      sudo rm -rf ./tmp/*/imagebuild/*/*.raw 2>/dev/null || true
+      ;;
+    "extracted")
+      echo "Cleaning up extracted image files in current directory..."
+      rm -f *.raw 2>/dev/null || true
+      ;;
+    "all"|*)
+      echo "Cleaning up all temporary image files..."
+      sudo rm -rf ./tmp/*/imagebuild/*/*.raw 2>/dev/null || true
+      rm -f *.raw 2>/dev/null || true
+      ;;
+  esac
+}
+
 run_qemu_boot_test() {
   local IMAGE_PATTERN="$1"
   if [ -z "$IMAGE_PATTERN" ]; then
@@ -125,11 +146,8 @@ run_qemu_boot_test() {
       result=1
     fi
     
-    # Clean up extracted raw file
-    if [ -f \"\$RAW_IMAGE\" ]; then
-      echo \"Cleaning up extracted image file: \$RAW_IMAGE\"
-      rm -f \"\$RAW_IMAGE\"
-    fi
+    # Clean up extracted raw file using centralized function
+    cleanup_image_files extracted
     
     # Return to original directory
     cd \"\$ORIGINAL_DIR\"
@@ -262,6 +280,8 @@ build_azl3_raw_image() {
         echo "QEMU boot test FAILED for AZL3 raw image"
         exit 1
       fi
+      # Clean up after QEMU test to free space
+      cleanup_image_files raw
     fi
   else
     echo "AZL3 raw Image build failed."
@@ -313,6 +333,8 @@ build_emt3_raw_image() {
         echo "QEMU boot test FAILED for EMT3 raw image"
         exit 1
       fi
+      # Clean up after QEMU test to free space
+      cleanup_image_files raw
     fi
   else
     echo "EMT3 raw Image build failed."
@@ -326,7 +348,7 @@ build_emt3_iso_image() {
   echo "Ensuring we're in the working directory before starting builds..."
   cd "$WORKING_DIR"
   echo "Current working directory: $(pwd)"
-  output=$( sudo -S ./build/os-image-composer build image-templates/emt3-x86_64-minimal-iso.yml 2>&1)
+  output=$( sudo -S ./build/os-image-composer build image-templates/emt3-x86_64-minimal-iso.yml)
   # Check for the success message in the output
   if echo "$output" | grep -q "image build completed successfully"; then
     echo "EMT3 iso Image build passed."
@@ -363,6 +385,8 @@ build_elxr12_raw_image() {
         echo "QEMU boot test FAILED for ELXR12 raw image"
         exit 1
       fi
+      # Clean up after QEMU test to free space
+      cleanup_image_files raw
     fi
   else
     echo "ELXR12 raw Image build failed."
@@ -412,6 +436,8 @@ build_elxr12_immutable_raw_image() {
         echo "QEMU boot test FAILED for ELXR12 immutable raw image"
         exit 1
       fi
+      # Clean up after QEMU test to free space
+      cleanup_image_files raw
     fi
   else
     echo "ELXR12 immutable raw Image build failed."
@@ -437,6 +463,8 @@ build_emt3_immutable_raw_image() {
         echo "QEMU boot test FAILED for EMT3 immutable raw image"
         exit 1
       fi
+      # Clean up after QEMU test to free space
+      cleanup_image_files raw
     fi
   else
     echo "EMT3 immutable raw Image build failed."
@@ -462,6 +490,8 @@ build_azl3_immutable_raw_image() {
         echo "QEMU boot test FAILED for AZL3 immutable raw image"
         exit 1
       fi
+      # Clean up after QEMU test to free space
+      cleanup_image_files raw
     fi
   else
     echo "AZL3 immutable raw Image build failed."