ci/amd: Track merge-skips.txt changes

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

src/amd/ci/gitlab-ci-inc.yml

@@ -13,6 +13,7 @@
         - src/amd/ci/$GPU_VERSION-fails.txt
         - src/amd/ci/$GPU_VERSION-flakes.txt
         - src/amd/ci/$GPU_VERSION-skips.txt
+        - src/amd/ci/$GPU_VERSION-merge-skips.txt
         - src/amd/ci/$VK_DRIVER-skips.txt
         - src/amd/ci/$GALLIUM_DRIVER-skips.txt
         - src/amd/ci/$DRIVER_NAME-skips.txt

src/amd/ci/radeonsi-raven-merge-skips.txt

@@ -0,0 +1,6 @@
+# Skip tests from pre-merge pipelines, mainly because some tests extrapolate the 1 minute mark
+# Note that this not affect nightly jobs.
+
+glx@glx-buffer-age vblank_mode=0
+glx@glx_arb_sync_control@swapbuffersmsc-return swap_interval 1
+spec@egl 1.4@eglcreatepbuffersurface with egl_samples set