ci: skip slow tests on all non-"full" jobs

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31828>
This commit is contained in:
Eric Engestrom
2024-10-24 16:42:40 +02:00
committed by Marge Bot
parent bedb2f8a86
commit 03f056ea71
8 changed files with 7 additions and 10 deletions

View File

@@ -38,8 +38,6 @@ workflow:
JOB_PRIORITY: 75 JOB_PRIORITY: 75
# fast-fail in merge pipelines: stop early if we get this many unexpected fails/crashes # fast-fail in merge pipelines: stop early if we get this many unexpected fails/crashes
DEQP_RUNNER_MAX_FAILS: 40 DEQP_RUNNER_MAX_FAILS: 40
# Flag to advertise the CI scripts if we are in a merge pipeline
IS_MERGE_PIPELINE: 1
# post-merge pipeline # post-merge pipeline
- if: &is-post-merge $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "push" - if: &is-post-merge $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "push"
# Pre-merge pipeline # Pre-merge pipeline

View File

@@ -66,7 +66,6 @@ VARS=(
HWCI_TEST_ARGS HWCI_TEST_ARGS
HWCI_TEST_SCRIPT HWCI_TEST_SCRIPT
IR3_SHADER_DEBUG IR3_SHADER_DEBUG
IS_MERGE_PIPELINE
JOB_ARTIFACTS_BASE JOB_ARTIFACTS_BASE
JOB_RESULTS_PATH JOB_RESULTS_PATH
JOB_ROOTFS_OVERLAY_PATH JOB_ROOTFS_OVERLAY_PATH

View File

@@ -123,7 +123,7 @@ if [ -e "$INSTALL/$GPU_VERSION-skips.txt" ]; then
DEQP_SKIPS="$DEQP_SKIPS $INSTALL/$GPU_VERSION-skips.txt" DEQP_SKIPS="$DEQP_SKIPS $INSTALL/$GPU_VERSION-skips.txt"
fi fi
if [ -e "$INSTALL/$GPU_VERSION-slow-skips.txt" ] && [ -n "${IS_MERGE_PIPELINE:-}" ]; then if [ -e "$INSTALL/$GPU_VERSION-slow-skips.txt" ] && [[ $CI_JOB_NAME != *full* ]]; then
DEQP_SKIPS="$DEQP_SKIPS $INSTALL/$GPU_VERSION-slow-skips.txt" DEQP_SKIPS="$DEQP_SKIPS $INSTALL/$GPU_VERSION-slow-skips.txt"
fi fi

View File

@@ -78,7 +78,7 @@ if [ -e "$INSTALL/$GPU_VERSION-skips.txt" ]; then
PIGLIT_SKIPS="$PIGLIT_SKIPS $INSTALL/$GPU_VERSION-skips.txt" PIGLIT_SKIPS="$PIGLIT_SKIPS $INSTALL/$GPU_VERSION-skips.txt"
fi fi
if [ -e "$INSTALL/$GPU_VERSION-slow-skips.txt" ] && [ -n "${IS_MERGE_PIPELINE:-}" ]; then if [ -e "$INSTALL/$GPU_VERSION-slow-skips.txt" ] && [[ $CI_JOB_NAME != *full* ]]; then
PIGLIT_SKIPS="$PIGLIT_SKIPS $INSTALL/$GPU_VERSION-slow-skips.txt" PIGLIT_SKIPS="$PIGLIT_SKIPS $INSTALL/$GPU_VERSION-slow-skips.txt"
fi fi

View File

@@ -1,5 +1,5 @@
# Skip tests from pre-merge pipelines, mainly because some tests extrapolate the 1 minute mark # Skip tests, mainly because some tests exceed the 1 minute mark
# Note that this not affect nightly jobs. # Note that this not affect full jobs.
glx@glx-buffer-age vblank_mode=0 glx@glx-buffer-age vblank_mode=0
glx@glx_arb_sync_control@swapbuffersmsc-return swap_interval 1 glx@glx_arb_sync_control@swapbuffersmsc-return swap_interval 1

View File

@@ -1,4 +1,4 @@
# Skip some >1min tests in pre merge. These will be covered in the nightly jobs. # Skip some >1min tests. These will be covered in the full jobs.
KHR-GL46.packed_pixels.varied_rectangle.* KHR-GL46.packed_pixels.varied_rectangle.*
KHR-GL46.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize KHR-GL46.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize
KHR-Single-GL46.arrays_of_arrays_gl.SizedDeclarationsPrimitive KHR-Single-GL46.arrays_of_arrays_gl.SizedDeclarationsPrimitive

View File

@@ -1,4 +1,4 @@
# Skip some >1min tests in pre merge. These will be covered in the nightly jobs. # Skip some >1min tests. These will be covered in the full jobs.
KHR-GL46.packed_pixels.varied_rectangle.* KHR-GL46.packed_pixels.varied_rectangle.*
KHR-GL46.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize KHR-GL46.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize
KHR-Single-GL46.arrays_of_arrays_gl.SizedDeclarationsPrimitive KHR-Single-GL46.arrays_of_arrays_gl.SizedDeclarationsPrimitive

View File

@@ -1,4 +1,4 @@
# These are pretty slow, so just run the 2d cases in pre-merge. # These are pretty slow, so just run the 2d cases in non-"full" jobs.
dEQP-VK.*robustness.*.no_fmt_qual.*samples_1.*_array.frag dEQP-VK.*robustness.*.no_fmt_qual.*samples_1.*_array.frag
dEQP-VK.*robustness.*.no_fmt_qual.*samples_1.3d.frag dEQP-VK.*robustness.*.no_fmt_qual.*samples_1.3d.frag
dEQP-VK.*robustness.*.no_fmt_qual.*samples_1.cube.frag dEQP-VK.*robustness.*.no_fmt_qual.*samples_1.cube.frag