ci/broadcom: consolidate v3d-rpi4* jobs into a single v3d-rpi4-gl:armhf

Using now 12 instead of 14 runners, most jobs take 11-13 minutes, which
is about the same as when they were all running separately (10-13 min).

Stress-tested over 8 runs.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21902>

src/broadcom/ci/broadcom-rpi4-fails.txt

@@ -1,8 +1,8 @@
 glx@glx-make-current,Crash
 glx@glx-multi-window-single-context,Fail
 glx@glx-swap-pixmap-bad,Fail
-glx@glx-visuals-depth -pixmap,Crash
+glx@glx-visuals-depth -pixmap,Fail
-glx@glx-visuals-stencil -pixmap,Crash
+glx@glx-visuals-stencil -pixmap,Fail
 glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail
 glx@glx_arb_create_context_no_error@no error,Fail
 glx@glx_ext_import_context@free context,Fail
@@ -359,6 +359,24 @@ spec@ext_gpu_shader4@tex-miplevel-selection gpu4texturelodoffset 1darray,Fail
 spec@ext_gpu_shader4@tex-miplevel-selection gpu4texturelodoffset 1darrayshadow,Fail
 spec@ext_gpu_shader4@tex-miplevel-selection gpu4textureoffset 1darray,Fail
 spec@ext_gpu_shader4@tex-miplevel-selection gpu4textureoffset 1darrayshadow,Fail
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-export,Fail
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-refcount,Fail
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_argb8888,Fail
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_nv12,Fail
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p010,Fail
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p012,Fail
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p016,Fail
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_uyvy,Fail
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_xrgb8888,Fail
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y210,Fail
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y212,Fail
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y216,Fail
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y412,Fail
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y416,Fail
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuv420,Fail
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuyv,Fail
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yvu420,Fail
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-transcode-nv12-as-r8-gr88,Fail
 spec@ext_packed_depth_stencil@texwrap formats bordercolor,Fail
 spec@ext_packed_depth_stencil@texwrap formats bordercolor-swizzled,Fail
 spec@ext_packed_depth_stencil@texwrap formats bordercolor-swizzled@GL_DEPTH24_STENCIL8- swizzled- border color only,Fail

src/broadcom/ci/deqp-broadcom-rpi4-egl.toml

@@ -1,21 +0,0 @@
-# wayland
-[[deqp]]
-deqp = "/deqp/modules/egl/deqp-egl-wayland"
-caselists = ["/deqp/mustpass/egl-master.txt"]
-deqp_args = [
-    "--deqp-surface-width=256", "--deqp-surface-height=256",
-    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
-    "--deqp-gl-config-name=rgba8888d24s8ms0",
-]
-prefix = "wayland-"
-
-# x11
-[[deqp]]
-deqp = "/deqp/modules/egl/deqp-egl"
-caselists = ["/deqp/mustpass/egl-master.txt"]
-deqp_args = [
-    "--deqp-surface-width=256", "--deqp-surface-height=256",
-    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
-    "--deqp-gl-config-name=rgba8888d24s8ms0",
-]
-prefix = "x11-"

src/broadcom/ci/deqp-broadcom-rpi4-piglit.toml

@@ -1,6 +0,0 @@
-[[piglit]]
-piglit_folder = "/piglit"
-profile = "all"
-process_isolation = true
-  [piglit.env]
-  PIGLIT_PLATFORM = "mixed_glx_egl"

src/broadcom/ci/deqp-broadcom-rpi4.toml

@@ -47,3 +47,32 @@ deqp_args = [
     "--deqp-surface-width=256",
     "--deqp-visibility=hidden",
 ]
+
+[[piglit]]
+piglit_folder = "/piglit"
+profile = "all"
+process_isolation = true
+  [piglit.env]
+  PIGLIT_PLATFORM = "mixed_glx_egl"
+
+# wayland
+[[deqp]]
+deqp = "/deqp/modules/egl/deqp-egl-wayland"
+caselists = ["/deqp/mustpass/egl-master.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+prefix = "wayland-"
+
+# x11
+[[deqp]]
+deqp = "/deqp/modules/egl/deqp-egl"
+caselists = ["/deqp/mustpass/egl-master.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+prefix = "x11-"

src/broadcom/ci/gitlab-ci.yml

@@ -32,39 +32,20 @@ vc4-rpi3-gl:armhf:
     DEQP_SUITE: broadcom-rpi3
     HWCI_START_WESTON: 1
 
-.v3d-rpi4-test:armhf:
+v3d-rpi4-gl:armhf:
   extends:
     - .broadcom-test:armhf
     - .v3d-rules
-  variables:
-    GPU_VERSION: broadcom-rpi4
-    HWCI_KERNEL_MODULES: v3d,vc4
   script:
     - ./install/bare-metal/poe-powered.sh
   tags:
     - igalia-rpi4
-
+  parallel: 12
-v3d-rpi4-gles:armhf:
-  extends:
-    - .v3d-rpi4-test:armhf
-  parallel: 8
-  variables:
-    DEQP_SUITE: broadcom-rpi4
-
-v3d-rpi4-egl:armhf:
-  extends:
-    - .v3d-rpi4-test:armhf
   variables:
+    GPU_VERSION: broadcom-rpi4
+    HWCI_KERNEL_MODULES: v3d,vc4
     HWCI_START_WESTON: 1
-    DEQP_SUITE: broadcom-rpi4-egl
+    DEQP_SUITE: broadcom-rpi4
-
-v3d-rpi4-piglit:armhf:
-  extends:
-    - .v3d-rpi4-test:armhf
-  parallel: 4
-  variables:
-    HWCI_START_XORG: 1
-    DEQP_SUITE: broadcom-rpi4-piglit
 
 v3d-rpi4-traces:arm64:
   extends: