From e9fad0b9aacc3cd12a15eeb7dc7b37590bf03e52 Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Tue, 21 Jun 2022 09:03:54 -0700 Subject: [PATCH] ci/vc4: Merge quick_shader in with deqp-gles All 4 jobs had a total of about 26 minutes of runner time, so squish them onto 3 runners and use gbm for the .shader_tests to avoid X overhead and hopefully succeed with full concurrency. Reviewed-by: Juan A. Suarez Part-of: --- src/broadcom/ci/deqp-broadcom-rpi3.toml | 8 ++++++++ src/broadcom/ci/gitlab-ci.yml | 12 ++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/broadcom/ci/deqp-broadcom-rpi3.toml b/src/broadcom/ci/deqp-broadcom-rpi3.toml index 218cb1835b6..152cf2b57e0 100644 --- a/src/broadcom/ci/deqp-broadcom-rpi3.toml +++ b/src/broadcom/ci/deqp-broadcom-rpi3.toml @@ -23,3 +23,11 @@ deqp_args = [ "--deqp-surface-width=256", "--deqp-visibility=hidden", ] + + +[[piglit]] +piglit_folder = "/piglit" +profile = "quick_shader" +process_isolation = true + [piglit.env] + PIGLIT_PLATFORM = "gbm" diff --git a/src/broadcom/ci/gitlab-ci.yml b/src/broadcom/ci/gitlab-ci.yml index bf64b62a790..8b3fc764c3a 100644 --- a/src/broadcom/ci/gitlab-ci.yml +++ b/src/broadcom/ci/gitlab-ci.yml @@ -17,10 +17,10 @@ tags: - igalia-rpi3 -vc4-rpi3-gles:armhf: +vc4-rpi3:armhf: extends: - .vc4-rpi3-test:armhf - parallel: 2 + parallel: 3 variables: HWCI_TEST_SCRIPT: "/install/deqp-runner.sh" DEQP_SUITE: broadcom-rpi3 @@ -51,14 +51,6 @@ vc4-rpi3-piglit-quick_gl:armhf: FDO_CI_CONCURRENT: 1 PIGLIT_PROFILES: quick_gl -vc4-rpi3-piglit-quick_shader:armhf: - extends: - - .vc4-rpi3-piglit:armhf - parallel: 2 - variables: - FDO_CI_CONCURRENT: 2 - PIGLIT_PROFILES: quick_shader - .v3d-rpi4-test:armhf: extends: - .baremetal-test-armhf