ci: rename "merge-skips" to "slow-skips" as they're about to be used outside of merge piplines
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31828>
This commit is contained in:
committed by
Marge Bot
parent
927a17f30a
commit
bedb2f8a86
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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().
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user