test: Use jq in a compatible way and for easier diff analysis

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 458babe7ee2e5fc0c4519a94249cbc1bd7cec9b6)

diff --git a/qa/standalone/scrub/osd-scrub-repair.sh b/qa/standalone/scrub/osd-scrub-repair.sh
index 7ef39c6395883d46289221bbf89057ef758fe5ac..ecc955063b63b36f07f45d77677fa35b554bf12d 100755 (executable)
--- a/qa/standalone/scrub/osd-scrub-repair.sh
+++ b/qa/standalone/scrub/osd-scrub-repair.sh
@@ -30,16 +30,19 @@ fi
 getjson="no"
 
 # Filter out mtime and local_mtime dates, version, prior_version and last_reqid (client) from any object_info.
-jqfilter='(. | (.inconsistents[].selected_object_info | .mtime ) |= "----Stripped-----")
-        | (. | (.inconsistents[].selected_object_info | .local_mtime ) |= "----Stripped-----" )
-        | (. | (.inconsistents[].selected_object_info | .last_reqid ) |= "----Stripped-----")
-        | (. | (.inconsistents[].selected_object_info | .version ) |= "----Stripped-----" )
-        | (. | (.inconsistents[].selected_object_info | .prior_version ) |= "----Stripped-----" )
-        | ( . | (.inconsistents[].shards[].object_info | .mtime ) |= "----Stripped-----" )
-        | ( . | (.inconsistents[].shards[].object_info | .local_mtime ) |= "----Stripped-----" )
-        | ( . | (.inconsistents[].shards[].object_info | .last_reqid ) |= "----Stripped-----" )
-        | ( .| (.inconsistents[].shards[].object_info | .version ) |= "----Stripped-----" )
-        | ( .| (.inconsistents[].shards[].object_info | .prior_version ) |= "----Stripped-----" )'
+jqfilter='def walk(f):
+  . as $in
+  | if type == "object" then
+      reduce keys[] as $key
+        ( {}; . + { ($key):  ($in[$key] | walk(f)) } ) | f
+    elif type == "array" then map( walk(f) ) | f
+    else f
+    end;
+walk(if type == "object" then del(.mtime) else . end)
+| walk(if type == "object" then del(.local_mtime) else . end)
+| walk(if type == "object" then del(.last_reqid) else . end)
+| walk(if type == "object" then del(.version) else . end)
+| walk(if type == "object" then del(.prior_version) else . end)'
 
 sortkeys='import json; import sys ; JSON=sys.stdin.read() ; ud = json.loads(JSON) ; print json.dumps(ud, sort_keys=True, indent=2)'