ci: Reduce the number of jobs

Specify the `parallel` variable at job level to be able to fine-tune it per job.

Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
Part-of: <https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/743>
macos/master
Corentin Noël 3 years ago committed by Marge Bot
parent c6723745fe
commit c43c15d552
  1. 6
      .gitlab-ci.yml
  2. 1
      .gitlab-ci/expectations/host/deqp-virgl-gl-flakes.txt
  3. 1
      .gitlab-ci/expectations/host/deqp-virgl-gles-flakes.txt
  4. 1
      .gitlab-ci/expectations/virt/deqp-virgl-gl-flakes.txt
  5. 1
      .gitlab-ci/expectations/virt/deqp-virgl-gles-flakes.txt

@ -198,7 +198,6 @@ make check venus:
.deqp-host: .deqp-host:
extends: extends:
- .gl-host-test - .gl-host-test
parallel: 3
.piglit-host: .piglit-host:
extends: extends:
@ -207,7 +206,6 @@ make check venus:
PIGLIT_PLATFORM: surfaceless_egl PIGLIT_PLATFORM: surfaceless_egl
PIGLIT_NO_WINDOW: 1 PIGLIT_NO_WINDOW: 1
PIGLIT_PROFILES: gpu PIGLIT_PROFILES: gpu
parallel: 2
.deqp-virt: .deqp-virt:
extends: extends:
@ -215,7 +213,6 @@ make check venus:
variables: variables:
# There will be FDO_CI_CONCURRENT Crosvm processes, so each should use a single thread # There will be FDO_CI_CONCURRENT Crosvm processes, so each should use a single thread
LP_NUM_THREADS: 1 LP_NUM_THREADS: 1
parallel: 3
.piglit-virt: .piglit-virt:
extends: extends:
@ -225,7 +222,6 @@ make check venus:
# Use all threads for rendering and only run one job at a time # Use all threads for rendering and only run one job at a time
LP_NUM_THREADS: ${FDO_CI_CONCURRENT} LP_NUM_THREADS: ${FDO_CI_CONCURRENT}
FORCE_FDO_CI_CONCURRENT: 1 FORCE_FDO_CI_CONCURRENT: 1
parallel: 4
# Host runners (virpipe/vtest) # Host runners (virpipe/vtest)
@ -279,6 +275,7 @@ deqp-gles-virt:
piglit-gl-virt: piglit-gl-virt:
extends: extends:
- .piglit-virt - .piglit-virt
parallel: 3
variables: variables:
GPU_VERSION: virgl-gl GPU_VERSION: virgl-gl
CROSVM_GPU_ARGS: *deqp-gl-crosvm-gpu-args CROSVM_GPU_ARGS: *deqp-gl-crosvm-gpu-args
@ -286,6 +283,7 @@ piglit-gl-virt:
piglit-gles-virt: piglit-gles-virt:
extends: extends:
- .piglit-virt - .piglit-virt
parallel: 3
variables: variables:
VIRGL_HOST_API: GLES VIRGL_HOST_API: GLES
GPU_VERSION: virgl-gles GPU_VERSION: virgl-gles

@ -1,3 +1,4 @@
dEQP-GLES31.functional.draw_buffers_indexed.random.max_implementation_draw_buffers.8
dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer.36 dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer.36
# https://gitlab.freedesktop.org/mesa/mesa/-/issues/4651 # https://gitlab.freedesktop.org/mesa/mesa/-/issues/4651
KHR-GL30.shaders30.glsl_constructors.bvec4_from_bool_mat3_vs KHR-GL30.shaders30.glsl_constructors.bvec4_from_bool_mat3_vs

@ -1 +1,2 @@
dEQP-GLES31.functional.draw_buffers_indexed.random.max_required_draw_buffers.9 dEQP-GLES31.functional.draw_buffers_indexed.random.max_required_draw_buffers.9
dEQP-GLES31.functional.draw_buffers_indexed.random.max_implementation_draw_buffers.8

@ -1,3 +1,4 @@
dEQP-GLES31.functional.draw_buffers_indexed.random.max_implementation_draw_buffers.8
dEQP-GLES31.functional.ssbo.layout.3_level_unsized_array.shared.mat4 dEQP-GLES31.functional.ssbo.layout.3_level_unsized_array.shared.mat4
dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer.36 dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer.36
dEQP-GLES31.functional.ssbo.layout.random.arrays_of_arrays.1 dEQP-GLES31.functional.ssbo.layout.random.arrays_of_arrays.1

@ -1,3 +1,4 @@
dEQP-GLES31.functional.draw_buffers_indexed.random.max_implementation_draw_buffers.8
dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer.36 dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer.36
dEQP-GLES31.functional.ssbo.layout.random.arrays_of_arrays.1 dEQP-GLES31.functional.ssbo.layout.random.arrays_of_arrays.1
dEQP-GLES31.functional.ssbo.layout.random.nested_structs_arrays_instance_arrays.22 dEQP-GLES31.functional.ssbo.layout.random.nested_structs_arrays_instance_arrays.22

Loading…
Cancel
Save