From: Guilherme Gallo <guilherme.gallo@collabora.com>
Date: Wed, 15 Mar 2023 11:31:13 +0000 (-0300)
Subject: ci: Improve piglit-traces "no-perf" filter
X-Git-Tag: upstream/23.3.3~11057
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2112d8b1f28ef695ef52d78dd80258f508197bc1;p=platform%2Fupstream%2Fmesa.git

ci: Improve piglit-traces "no-perf" filter

We filter out traces that work only in standard replay mode but not
profile one via yq (jq for YAML) manipulation.

The previous query needed to be fixed in some scenarios, such as traces
labeled with only `["no-perf"]`, which was being ignored by the query.

This commit updates the yq query with newer syntax to cover all current
cases (at least for freedreno).

Signed-off-by: Guilherme Gallo <guilherme.gallo@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22065>
---

diff --git a/.gitlab-ci/piglit/piglit-traces.sh b/.gitlab-ci/piglit/piglit-traces.sh
index 864ca78..8b42916 100755
--- a/.gitlab-ci/piglit/piglit-traces.sh
+++ b/.gitlab-ci/piglit/piglit-traces.sh
@@ -12,8 +12,8 @@ if [ "$PIGLIT_REPLAY_SUBCOMMAND" = "profile" ]; then
     # workaround for older Debian Bullseye libyaml 0.2.2
     sed -i "/^%YAML 1\.2$/d" "$PIGLIT_REPLAY_DESCRIPTION_FILE"
 
-    yq -i -Y '. | del(.traces[][] | select(.label[0,1,2,3,4,5,6,7,8,9] == "no-perf"))' \
-      "$PIGLIT_REPLAY_DESCRIPTION_FILE"  # label positions are a bit hack
+    yq -iY 'del(.traces[][] | select(.label[]? == "no-perf"))' \
+      "$PIGLIT_REPLAY_DESCRIPTION_FILE"
 fi
 
 # WINE