From bedb2f8a86a8aadbae3ab8b48769ab2651cd7562 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 24 Oct 2024 16:21:57 +0200 Subject: [PATCH] ci: rename "merge-skips" to "slow-skips" as they're about to be used outside of merge piplines Part-of: --- .gitlab-ci/deqp-runner.sh | 4 ++-- .gitlab-ci/piglit/piglit-runner.sh | 4 ++-- src/amd/ci/gitlab-ci-inc.yml | 2 +- ...si-raven-merge-skips.txt => radeonsi-raven-slow-skips.txt} | 0 ...eno-a618-merge-skips.txt => freedreno-a618-slow-skips.txt} | 0 src/freedreno/ci/freedreno-a630-skips.txt | 2 +- ...eno-a630-merge-skips.txt => freedreno-a630-slow-skips.txt} | 0 ...eno-a660-merge-skips.txt => freedreno-a660-slow-skips.txt} | 0 ...eno-a750-merge-skips.txt => freedreno-a750-slow-skips.txt} | 0 src/freedreno/ci/gitlab-ci-inc.yml | 2 +- src/gallium/drivers/zink/ci/gitlab-ci-inc.yml | 2 +- ...nk-anv-adl-merge-skips.txt => zink-anv-adl-slow-skips.txt} | 0 ...nk-anv-tgl-merge-skips.txt => zink-anv-tgl-slow-skips.txt} | 0 .../ci/{anv-jsl-merge-skips.txt => anv-jsl-slow-skips.txt} | 0 src/intel/ci/gitlab-ci-inc.yml | 2 +- 15 files changed, 9 insertions(+), 9 deletions(-) rename src/amd/ci/{radeonsi-raven-merge-skips.txt => radeonsi-raven-slow-skips.txt} (100%) rename src/freedreno/ci/{freedreno-a618-merge-skips.txt => freedreno-a618-slow-skips.txt} (100%) rename src/freedreno/ci/{freedreno-a630-merge-skips.txt => freedreno-a630-slow-skips.txt} (100%) rename src/freedreno/ci/{freedreno-a660-merge-skips.txt => freedreno-a660-slow-skips.txt} (100%) rename src/freedreno/ci/{freedreno-a750-merge-skips.txt => freedreno-a750-slow-skips.txt} (100%) rename src/gallium/drivers/zink/ci/{zink-anv-adl-merge-skips.txt => zink-anv-adl-slow-skips.txt} (100%) rename src/gallium/drivers/zink/ci/{zink-anv-tgl-merge-skips.txt => zink-anv-tgl-slow-skips.txt} (100%) rename src/intel/ci/{anv-jsl-merge-skips.txt => anv-jsl-slow-skips.txt} (100%) diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index b39bb3548a2..1e683fb6319 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -123,8 +123,8 @@ if [ -e "$INSTALL/$GPU_VERSION-skips.txt" ]; then DEQP_SKIPS="$DEQP_SKIPS $INSTALL/$GPU_VERSION-skips.txt" fi -if [ -e "$INSTALL/$GPU_VERSION-merge-skips.txt" ] && [ -n "${IS_MERGE_PIPELINE:-}" ]; then - DEQP_SKIPS="$DEQP_SKIPS $INSTALL/$GPU_VERSION-merge-skips.txt" +if [ -e "$INSTALL/$GPU_VERSION-slow-skips.txt" ] && [ -n "${IS_MERGE_PIPELINE:-}" ]; then + DEQP_SKIPS="$DEQP_SKIPS $INSTALL/$GPU_VERSION-slow-skips.txt" fi if [ "$PIGLIT_PLATFORM" != "gbm" ] ; then diff --git a/.gitlab-ci/piglit/piglit-runner.sh b/.gitlab-ci/piglit/piglit-runner.sh index df8e508b95e..805e42655a3 100755 --- a/.gitlab-ci/piglit/piglit-runner.sh +++ b/.gitlab-ci/piglit/piglit-runner.sh @@ -78,8 +78,8 @@ if [ -e "$INSTALL/$GPU_VERSION-skips.txt" ]; then PIGLIT_SKIPS="$PIGLIT_SKIPS $INSTALL/$GPU_VERSION-skips.txt" fi -if [ -e "$INSTALL/$GPU_VERSION-merge-skips.txt" ] && [ -n "${IS_MERGE_PIPELINE:-}" ]; then - PIGLIT_SKIPS="$PIGLIT_SKIPS $INSTALL/$GPU_VERSION-merge-skips.txt" +if [ -e "$INSTALL/$GPU_VERSION-slow-skips.txt" ] && [ -n "${IS_MERGE_PIPELINE:-}" ]; then + PIGLIT_SKIPS="$PIGLIT_SKIPS $INSTALL/$GPU_VERSION-slow-skips.txt" fi if [ "$PIGLIT_PLATFORM" != "gbm" ] ; then diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml index f42eefd04ee..d7e0d4f2112 100644 --- a/src/amd/ci/gitlab-ci-inc.yml +++ b/src/amd/ci/gitlab-ci-inc.yml @@ -13,7 +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/$GPU_VERSION-slow-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-slow-skips.txt similarity index 100% rename from src/amd/ci/radeonsi-raven-merge-skips.txt rename to src/amd/ci/radeonsi-raven-slow-skips.txt diff --git a/src/freedreno/ci/freedreno-a618-merge-skips.txt b/src/freedreno/ci/freedreno-a618-slow-skips.txt similarity index 100% rename from src/freedreno/ci/freedreno-a618-merge-skips.txt rename to src/freedreno/ci/freedreno-a618-slow-skips.txt diff --git a/src/freedreno/ci/freedreno-a630-skips.txt b/src/freedreno/ci/freedreno-a630-skips.txt index 5bdbb1dafc1..df42b0ce466 100644 --- a/src/freedreno/ci/freedreno-a630-skips.txt +++ b/src/freedreno/ci/freedreno-a630-skips.txt @@ -2,7 +2,7 @@ # non-zero-length and not starting with '#', will regex match to # delete lines from the test list. Be careful. -# Note normal merge CI also includes -merge-skips.txt, and that's where +# Note normal merge CI also includes -slow-skips.txt, and that's where # "it's slow but would pass/fail/crash within a couple of minutes" skips should go. # Still running after 3 hours, time is spent in batch_draw_tracking(). diff --git a/src/freedreno/ci/freedreno-a630-merge-skips.txt b/src/freedreno/ci/freedreno-a630-slow-skips.txt similarity index 100% rename from src/freedreno/ci/freedreno-a630-merge-skips.txt rename to src/freedreno/ci/freedreno-a630-slow-skips.txt diff --git a/src/freedreno/ci/freedreno-a660-merge-skips.txt b/src/freedreno/ci/freedreno-a660-slow-skips.txt similarity index 100% rename from src/freedreno/ci/freedreno-a660-merge-skips.txt rename to src/freedreno/ci/freedreno-a660-slow-skips.txt diff --git a/src/freedreno/ci/freedreno-a750-merge-skips.txt b/src/freedreno/ci/freedreno-a750-slow-skips.txt similarity index 100% rename from src/freedreno/ci/freedreno-a750-merge-skips.txt rename to src/freedreno/ci/freedreno-a750-slow-skips.txt diff --git a/src/freedreno/ci/gitlab-ci-inc.yml b/src/freedreno/ci/gitlab-ci-inc.yml index af06cd9f0bc..5684e493bf0 100644 --- a/src/freedreno/ci/gitlab-ci-inc.yml +++ b/src/freedreno/ci/gitlab-ci-inc.yml @@ -10,7 +10,7 @@ - src/freedreno/ci/$GPU_VERSION-fails.txt - src/freedreno/ci/$GPU_VERSION-flakes.txt - src/freedreno/ci/$GPU_VERSION-skips.txt - - src/freedreno/ci/$GPU_VERSION-merge-skips.txt + - src/freedreno/ci/$GPU_VERSION-slow-skips.txt - src/freedreno/ci/$PIGLIT_TRACES_FILE - src/freedreno/ci/$GPU_VERSION-vkd3d-fails.txt - src/freedreno/ci/$GPU_VERSION-vkd3d-flakes.txt diff --git a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml index d37598e72d0..2fc9410685f 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml @@ -11,7 +11,7 @@ - src/gallium/drivers/zink/ci/$GPU_VERSION-fails.txt - src/gallium/drivers/zink/ci/$GPU_VERSION-flakes.txt - src/gallium/drivers/zink/ci/$GPU_VERSION-skips.txt - - src/gallium/drivers/zink/ci/$GPU_VERSION-merge-skips.txt + - src/gallium/drivers/zink/ci/$GPU_VERSION-slow-skips.txt - src/gallium/drivers/zink/ci/$GPU_VERSION-validation-settings.txt - src/gallium/drivers/zink/ci/$PIGLIT_TRACES_FILE when: on_success diff --git a/src/gallium/drivers/zink/ci/zink-anv-adl-merge-skips.txt b/src/gallium/drivers/zink/ci/zink-anv-adl-slow-skips.txt similarity index 100% rename from src/gallium/drivers/zink/ci/zink-anv-adl-merge-skips.txt rename to src/gallium/drivers/zink/ci/zink-anv-adl-slow-skips.txt diff --git a/src/gallium/drivers/zink/ci/zink-anv-tgl-merge-skips.txt b/src/gallium/drivers/zink/ci/zink-anv-tgl-slow-skips.txt similarity index 100% rename from src/gallium/drivers/zink/ci/zink-anv-tgl-merge-skips.txt rename to src/gallium/drivers/zink/ci/zink-anv-tgl-slow-skips.txt diff --git a/src/intel/ci/anv-jsl-merge-skips.txt b/src/intel/ci/anv-jsl-slow-skips.txt similarity index 100% rename from src/intel/ci/anv-jsl-merge-skips.txt rename to src/intel/ci/anv-jsl-slow-skips.txt diff --git a/src/intel/ci/gitlab-ci-inc.yml b/src/intel/ci/gitlab-ci-inc.yml index 1f09a16f749..1edeafcdd7e 100644 --- a/src/intel/ci/gitlab-ci-inc.yml +++ b/src/intel/ci/gitlab-ci-inc.yml @@ -19,7 +19,7 @@ - src/intel/ci/$GPU_VERSION-fails.txt - src/intel/ci/$GPU_VERSION-flakes.txt - src/intel/ci/$GPU_VERSION-skips.txt - - src/intel/ci/$GPU_VERSION-merge-skips.txt + - src/intel/ci/$GPU_VERSION-slow-skips.txt - src/intel/ci/$VK_DRIVER-skips.txt - src/intel/ci/$GALLIUM_DRIVER-skips.txt - src/intel/ci/$DRIVER_NAME-skips.txt