From 72659d04e674fd9e8bccdedd5044ee54251b5d8c Mon Sep 17 00:00:00 2001 From: Guilherme Gallo Date: Tue, 15 Oct 2024 17:18:43 -0300 Subject: [PATCH] ci/amd: Track merge-skips.txt changes Signed-off-by: Guilherme Gallo Part-of: --- src/amd/ci/gitlab-ci-inc.yml | 1 + src/amd/ci/radeonsi-raven-merge-skips.txt | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 src/amd/ci/radeonsi-raven-merge-skips.txt diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml index f885ef7ebe2..f42eefd04ee 100644 --- a/src/amd/ci/gitlab-ci-inc.yml +++ b/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 diff --git a/src/amd/ci/radeonsi-raven-merge-skips.txt b/src/amd/ci/radeonsi-raven-merge-skips.txt new file mode 100644 index 00000000000..12482f8885a --- /dev/null +++ b/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