Add rpm content compare

Author: RazvanLiviuVarzaru

configuration/steps/commands/scripts/srpm_compare.sh

@@ -6,6 +6,8 @@ DIR_REBUILT=$2                            # Directory containing rebuilt rpms
 EXCLUDE_RPMS=$3                           # Comma-separated list of patterns to exclude from comparison
 EXCLUDE_PATTERNS=("${EXCLUDE_RPMS//,/ }") # Convert to array
 REQUIRES_DIR="rpm_requires"               # Directory to store rpm requires output
+PACKAGE_CONTENT_DIR="package_content"     # Directory to store package content output
+EXIT_LATER=0                              # Flag to indicate if we should exit later due to differences
 
 # === Function: Validate directory existence and non-empty (simple ls check) ===
 validate_directory() {
@@ -33,53 +35,74 @@ get_filtered_file_list() {
     "${FIND_CMD[@]}" | xargs -r -n1 basename | sort
 }
 
-# === Function: Run rpm requires on each file in both directories and save outputs ===
-run_rpm_requires() {
-    local FILES="$1"  # multiline string of filenames
-    mkdir -p "$REQUIRES_DIR/CI"
-    mkdir -p "$REQUIRES_DIR/REBUILT"
-
-    echo "Running rpm requires queries..."
+# === Function: Collect rpm requires or content ===
+get_rpm_info() {
+    local FILES="$1"
+    local MODE="$2"
+
+    if [ "$MODE" == "requires" ]; then
+        mkdir -p "$REQUIRES_DIR/CI"
+        mkdir -p "$REQUIRES_DIR/REBUILT"
+    elif [ "$MODE" == "content" ]; then
+        mkdir -p "$PACKAGE_CONTENT_DIR/CI"
+        mkdir -p "$PACKAGE_CONTENT_DIR/REBUILT"
+    else
+        echo "Error: Invalid mode specified. Use 'requires' or 'content'."
+        exit 1
+    fi
 
     while IFS= read -r FILENAME; do
         local FILEPATH_CI="$DIR_CI/$FILENAME"
         local FILEPATH_REBUILT="$DIR_REBUILT/$FILENAME"
-        rpm -q --requires -p "$FILEPATH_CI" 2>/dev/null | sed -e 's/>=.*/>=/' -e 's/\([A-Z0-9._]*\)\([0-9]*bit\)$//' -e '/MariaDB-compat/d' -e '/rpmlib(FileCaps)/d' > "$REQUIRES_DIR/CI/$FILENAME.requires"
-        rpm -q --requires -p "$FILEPATH_REBUILT" 2>/dev/null | sed -e 's/>=.*/>=/' -e 's/\([A-Z0-9._]*\)\([0-9]*bit\)$//' -e '/MariaDB-compat/d' -e '/rpmlib(FileCaps)/d' > "$REQUIRES_DIR/REBUILT/$FILENAME.requires"
+
+        if [ "$MODE" == "requires" ]; then
+            rpm -q --requires -p "$FILEPATH_CI" 2>/dev/null | sed -e 's/>=.*/>=/' -e 's/\([A-Z0-9._]*\)\([0-9]*bit\)$//' -e '/MariaDB-compat/d' -e '/rpmlib(FileCaps)/d' > "$REQUIRES_DIR/CI/$FILENAME.requires"
+            rpm -q --requires -p "$FILEPATH_REBUILT" 2>/dev/null | sed -e 's/>=.*/>=/' -e 's/\([A-Z0-9._]*\)\([0-9]*bit\)$//' -e '/MariaDB-compat/d' -e '/rpmlib(FileCaps)/d' > "$REQUIRES_DIR/REBUILT/$FILENAME.requires"
+        elif [ "$MODE" == "content" ]; then
+            # src_1 to src_0 replacement is to account for in-source (CI build) vs out-of-source (rebuild)
+            # build-id paths are unique per build, so we exclude them
+            rpm -qlp "$FILEPATH_CI" 2>/dev/null | sed -e '/\.build-id/d; s@/src_1@/src_0@' | sort -u > "$PACKAGE_CONTENT_DIR/CI/$FILENAME.content"
+            rpm -qlp "$FILEPATH_REBUILT" 2>/dev/null | sed -e '/\.build-id/d; s@/src_1@/src_0@' | sort -u > "$PACKAGE_CONTENT_DIR/REBUILT/$FILENAME.content"
+        fi
     done <<< "$FILES"
 }
 
-# === Function: Compare rpm requires output files and report differences ===
-compare_requires() {
+
+# === Function: Compare rpm requires or content ===
+compare_rpm_info () {
+    local MODE="$1"
+    local DIR="$2"
+    local OTHER_DIR="$3"
     local DIFFS_FOUND=0
-    echo "Comparing rpm requires files..."
 
-    for REQFILE_CI in "$REQUIRES_DIR/CI/"*.requires; do
-        FILENAME=$(basename "$REQFILE_CI" .requires)
-        REQFILE_REBUILT="$REQUIRES_DIR/REBUILT/$FILENAME.requires"
+    touch ""${MODE}"_DIFFS.txt"
+
+    for FILE in "$DIR"/*."$MODE"; do
+        FILENAME=$(basename "$FILE" ".$MODE")
+        OTHER_FILE="$OTHER_DIR/$FILENAME.$MODE"
 
-        if [ ! -f "$REQFILE_REBUILT" ]; then
-            echo "File '$FILENAME' missing in REBUILT requires output."
+        if [ ! -f "$OTHER_FILE" ]; then
+            echo "File '$FILENAME' missing in $OTHER_DIR."
             DIFFS_FOUND=1
             continue
         fi
 
-        # Compare ignoring order and whitespace by sorting lines before diff
-        if ! diff -q <(sort "$REQFILE_CI") <(sort "$REQFILE_REBUILT") >/dev/null; then
-            echo "=================================================================="
-            echo "Difference found in requires for '$FILENAME':"
-            echo "=================================================================="
-            diff -u <(sort "$REQFILE_CI") <(sort "$REQFILE_REBUILT")
+        if ! diff -q <(sort "$FILE") <(sort "$OTHER_FILE") >/dev/null; then
+            echo "==================================================================" >> "${MODE}"_DIFFS.txt
+            echo "Difference found in rpm $MODE for '$FILENAME':" >> "${MODE}"_DIFFS.txt
+            echo "==================================================================" >> "${MODE}"_DIFFS.txt
+            diff -u <(sort "$FILE") <(sort "$OTHER_FILE") >> "${MODE}"_DIFFS.txt || true
             DIFFS_FOUND=1
         fi
     done
 
     if [ $DIFFS_FOUND -eq 0 ]; then
-        echo "All rpm requires outputs match."
+        echo "All rpm $MODE outputs match."
     else
-        echo "Some differences detected in rpm requires outputs."
-        exit 1
+        echo "Some differences detected in rpm $MODE outputs."
+        EXIT_LATER=1
     fi
+
 }
 
 # === Main script execution ===
@@ -107,8 +130,21 @@ if [ -n "$ONLY_IN_CI" ] || [ -n "$ONLY_IN_REBUILT" ]; then
 else
     echo "Success: Files match by name. Continuing processing..."
     echo "$FILES_CI" > rpms_to_compare.txt
-    # Run rpm requires queries and save outputs with filtering
-    run_rpm_requires "$FILES_CI"
-    # Compare rpm requires outputs
-    compare_requires
+
+    # Compare rpm requires
+    get_rpm_info "$FILES_CI" "requires"
+    compare_rpm_info "requires" "$REQUIRES_DIR/CI" "$REQUIRES_DIR/REBUILT"
+
+    # Compare rpm content
+    get_rpm_info "$FILES_CI" "content"
+    compare_rpm_info "content" "$PACKAGE_CONTENT_DIR/CI" "$PACKAGE_CONTENT_DIR/REBUILT"
+
+    if [ $EXIT_LATER -eq 1 ]; then
+        echo "Exiting with error due to differences found."
+        cat requires_DIFFS.txt content_DIFFS.txt
+        exit 1
+    else
+        echo "All checks passed successfully."
+        exit 0
+    fi
 fi