From 4b06e1fcf5452ec23e026810a6b11b5c6fc0805e Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 6 May 2025 22:41:41 +0200 Subject: [PATCH] broadcom/ci: add ci-tron variant of each job Traces jobs upload their results at the end, making them incompatible with the current design of CI-tron which doesn't allow internet access for security reasons, so they are not included for now. We're working on a solution for controlled access to specific domains, and will add the traces jobs once that's ready. Part-of: --- src/broadcom/ci/gitlab-ci.yml | 271 ++++++++++++++++++++++++++++++++++ 1 file changed, 271 insertions(+) diff --git a/src/broadcom/ci/gitlab-ci.yml b/src/broadcom/ci/gitlab-ci.yml index 70945b77248..8f837e938d6 100644 --- a/src/broadcom/ci/gitlab-ci.yml +++ b/src/broadcom/ci/gitlab-ci.yml @@ -13,6 +13,19 @@ vc4-rpi3-gl:arm64: DEQP_SUITE: broadcom-rpi3-gl HWCI_START_WESTON: 1 +.ci-tron-vc4-rpi3-gl:arm64: + extends: + - .ci-tron-arm64-test-gl + - .ci-tron-broadcom-rpi3:arm64 + - .test-piglit + - .vc4-rules + timeout: 25m + parallel: 3 + variables: + CI_TRON_TIMEOUT__OVERALL__MINUTES: 20 + DEQP_SUITE: broadcom-rpi3-gl + HWCI_START_WESTON: 1 + vc4-rpi3-gl-piglit-full:arm64: extends: - vc4-rpi3-gl:arm64 @@ -24,6 +37,15 @@ vc4-rpi3-gl-piglit-full:arm64: variables: DEQP_SUITE: broadcom-rpi3-piglit-full +.ci-tron-vc4-rpi3-gl-piglit-full:arm64: + extends: + - .ci-tron-vc4-rpi3-gl:arm64 + - .vc4-manual-rules + timeout: 25m + variables: + CI_TRON_TIMEOUT__OVERALL__MINUTES: 20 + DEQP_SUITE: broadcom-rpi3-piglit-full + vc4-rpi3-gl:arm32: extends: - .igalia-bcm2837-rpi-3-b @@ -36,6 +58,18 @@ vc4-rpi3-gl:arm32: variables: DEQP_SUITE: broadcom-rpi3-gl-arm32 +.ci-tron-vc4-rpi3-gl:arm32: + extends: + - .ci-tron-arm32-test-gl + - .ci-tron-broadcom-rpi3:arm32 + - .igalia-bcm2835-vc4 + - .vc4-manual-rules + timeout: 25m + variables: + CI_TRON_TIMEOUT__OVERALL__MINUTES: 20 + HWCI_START_WESTON: 1 + DEQP_SUITE: broadcom-rpi3-gl-arm32 + vc4-rpi3-gl-asan:arm64: extends: - .igalia-bcm2837-rpi-3-b @@ -48,6 +82,18 @@ vc4-rpi3-gl-asan:arm64: DEQP_SUITE: broadcom-rpi3-gl-asan DEQP_FRACTION: 5 +.ci-tron-vc4-rpi3-gl-asan:arm64: + extends: + - .ci-tron-arm64-test-asan-gl + - .ci-tron-broadcom-rpi3:arm64 + - .vc4-manual-rules + timeout: 25m + variables: + CI_TRON_TIMEOUT__OVERALL__MINUTES: 20 + FDO_CI_CONCURRENT: 1 + DEQP_SUITE: broadcom-rpi3-gl-asan + DEQP_FRACTION: 5 + vc4-rpi3-gl-ubsan:arm64: extends: - .igalia-bcm2837-rpi-3-b @@ -61,6 +107,19 @@ vc4-rpi3-gl-ubsan:arm64: DEQP_SUITE: broadcom-rpi3-gl-ubsan DEQP_FRACTION: 2 +.ci-tron-vc4-rpi3-gl-ubsan:arm64: + extends: + - .ci-tron-arm64-test-ubsan-gl + - .ci-tron-broadcom-rpi3:arm64 + - .vc4-manual-rules + timeout: 30m + variables: + CI_TRON_TIMEOUT__OVERALL__MINUTES: 25 + # UBSan is quite slow, so restrict to 1 job + FDO_CI_CONCURRENT: 1 + DEQP_SUITE: broadcom-rpi3-gl-ubsan + DEQP_FRACTION: 2 + v3d-rpi4-gl:arm64: extends: - .igalia-bcm2711-rpi-4 @@ -73,6 +132,19 @@ v3d-rpi4-gl:arm64: HWCI_START_WESTON: 1 DEQP_SUITE: broadcom-rpi4-gl +.ci-tron-v3d-rpi4-gl:arm64: + extends: + - .ci-tron-arm64-test-gl + - .ci-tron-broadcom-rpi4:arm64 + - .test-piglit + - .v3d-rules + timeout: 25m + parallel: 8 + variables: + CI_TRON_TIMEOUT__OVERALL__MINUTES: 20 + HWCI_START_WESTON: 1 + DEQP_SUITE: broadcom-rpi4-gl + v3d-rpi4-gl-full:arm64: extends: - v3d-rpi4-gl:arm64 @@ -86,6 +158,16 @@ v3d-rpi4-gl-full:arm64: variables: DEQP_FRACTION: 1 +.ci-tron-v3d-rpi4-gl-full:arm64: + extends: + - .ci-tron-v3d-rpi4-gl:arm64 + - .v3d-manual-rules + timeout: 45m + parallel: 8 + variables: + CI_TRON_TIMEOUT__OVERALL__MINUTES: 40 + DEQP_FRACTION: 1 + v3d-rpi4-rusticl:arm64: extends: - .igalia-bcm2711-rpi-4 @@ -96,6 +178,17 @@ v3d-rpi4-rusticl:arm64: variables: DEQP_SUITE: v3d-rusticl +.ci-tron-v3d-rpi4-rusticl:arm64: + extends: + - .ci-tron-arm64-test-gl + - .ci-tron-broadcom-rpi4:arm64 + - .test-piglit + - .v3d-rusticl-manual-rules + timeout: 40m + variables: + CI_TRON_TIMEOUT__OVERALL__MINUTES: 35 + DEQP_SUITE: v3d-rusticl + v3d-rpi4-traces:arm64: extends: - .igalia-bcm2711-rpi-4 @@ -121,6 +214,16 @@ v3d-rpi4-gl:arm32: variables: DEQP_SUITE: broadcom-rpi4-gl-arm32 +.ci-tron-v3d-rpi4-gl:arm32: + extends: + - .ci-tron-arm32-test-gl + - .ci-tron-broadcom-rpi4:arm32 + - .v3d-manual-rules + timeout: 35m + variables: + CI_TRON_TIMEOUT__OVERALL__MINUTES: 30 + DEQP_SUITE: broadcom-rpi4-gl-arm32 + v3d-rpi4-gl-asan:arm64: extends: - .igalia-bcm2711-rpi-4 @@ -134,6 +237,19 @@ v3d-rpi4-gl-asan:arm64: # FIXME: set to 9 once the new failures are investigated DEQP_FRACTION: 30 +.ci-tron-v3d-rpi4-gl-asan:arm64: + extends: + - .ci-tron-arm64-test-asan-gl + - .ci-tron-broadcom-rpi4:arm64 + - .v3d-manual-rules + timeout: 30m + variables: + CI_TRON_TIMEOUT__OVERALL__MINUTES: 25 + FDO_CI_CONCURRENT: 1 + DEQP_SUITE: broadcom-rpi4-gl-asan + # FIXME: set to 9 once the new failures are investigated + DEQP_FRACTION: 30 + v3d-rpi4-gl-ubsan:arm64: extends: - .igalia-bcm2711-rpi-4 @@ -147,6 +263,19 @@ v3d-rpi4-gl-ubsan:arm64: DEQP_SUITE: broadcom-rpi4-gl-ubsan DEQP_FRACTION: 6 +.ci-tron-v3d-rpi4-gl-ubsan:arm64: + extends: + - .ci-tron-arm64-test-ubsan-gl + - .ci-tron-broadcom-rpi4:arm64 + - .v3d-manual-rules + timeout: 30m + variables: + CI_TRON_TIMEOUT__OVERALL__MINUTES: 25 + # UBSan is quite slow, so restrict to 1 job + FDO_CI_CONCURRENT: 1 + DEQP_SUITE: broadcom-rpi4-gl-ubsan + DEQP_FRACTION: 6 + v3dv-rpi4-vk:arm64: extends: - .igalia-bcm2711-rpi-4 @@ -161,6 +290,19 @@ v3dv-rpi4-vk:arm64: DEQP_FRACTION: 3 FLAKES_CHANNEL: "#videocore-ci" +.ci-tron-v3dv-rpi4-vk:arm64: + extends: + - .ci-tron-arm64-test-vk + - .ci-tron-broadcom-rpi4:arm64 + - .v3dv-rules + parallel: 8 + timeout: 25m + variables: + CI_TRON_TIMEOUT__OVERALL__MINUTES: 22 + HWCI_START_WESTON: 1 + DEQP_SUITE: broadcom-rpi4-vk + DEQP_FRACTION: 3 + v3dv-rpi4-vk-full:arm64: extends: - v3dv-rpi4-vk:arm64 @@ -176,6 +318,18 @@ v3dv-rpi4-vk-full:arm64: TEST_SETUP_AND_UPLOAD_MARGIN_MINUTES: 10 DEQP_FRACTION: 1 +.ci-tron-v3dv-rpi4-vk-full:arm64: + extends: + - .ci-tron-v3dv-rpi4-vk:arm64 + - .v3dv-manual-rules + parallel: 8 + timeout: 2h + variables: + CI_TRON_TIMEOUT__OVERALL__MINUTES: 110 + HWCI_START_WESTON: 1 + DEQP_SUITE: broadcom-rpi4-vk + DEQP_FRACTION: 1 + v3dv-rpi4-vk-asan:arm64: extends: - .igalia-bcm2711-rpi-4 @@ -188,6 +342,18 @@ v3dv-rpi4-vk-asan:arm64: DEQP_SUITE: broadcom-rpi4-vk-asan DEQP_FRACTION: 200 +.ci-tron-v3dv-rpi4-vk-asan:arm64: + extends: + - .ci-tron-arm64-test-asan-vk + - .ci-tron-broadcom-rpi4:arm64 + - .v3dv-manual-rules + timeout: 25m + variables: + CI_TRON_TIMEOUT__OVERALL__MINUTES: 20 + FDO_CI_CONCURRENT: 1 + DEQP_SUITE: broadcom-rpi4-vk-asan + DEQP_FRACTION: 200 + v3dv-rpi4-vk-ubsan:arm64: extends: - .igalia-bcm2711-rpi-4 @@ -201,6 +367,19 @@ v3dv-rpi4-vk-ubsan:arm64: DEQP_SUITE: broadcom-rpi4-vk-ubsan DEQP_FRACTION: 200 +.ci-tron-v3d-rpi4-vk-ubsan:arm64: + extends: + - .ci-tron-arm64-test-ubsan-vk + - .ci-tron-broadcom-rpi4:arm64 + - .v3dv-manual-rules + timeout: 25m + variables: + CI_TRON_TIMEOUT__OVERALL__MINUTES: 25 + # UBSan is quite slow, so restrict to 1 job + FDO_CI_CONCURRENT: 1 + DEQP_SUITE: broadcom-rpi4-vk-ubsan + DEQP_FRACTION: 200 + v3d-rpi5-gl:arm64: extends: - .igalia-bcm2712-rpi-5 @@ -213,6 +392,19 @@ v3d-rpi5-gl:arm64: DEQP_SUITE: broadcom-rpi5-gl DEQP_FRACTION: 4 +.ci-tron-v3d-rpi5-gl:arm64: + extends: + - .ci-tron-arm64-test-gl + - .ci-tron-broadcom-rpi5:arm64 + - .test-piglit + - .v3d-rules + timeout: 25m + variables: + CI_TRON_TIMEOUT__OVERALL__MINUTES: 20 + HWCI_START_WESTON: 1 + DEQP_SUITE: broadcom-rpi5-gl + DEQP_FRACTION: 4 + v3d-rpi5-gl-full:arm64: extends: - v3d-rpi5-gl:arm64 @@ -227,6 +419,15 @@ v3d-rpi5-gl-full:arm64: TEST_SETUP_AND_UPLOAD_MARGIN_MINUTES: 10 DEQP_FRACTION: 1 +.ci-tron-v3d-rpi5-gl-full:arm64: + extends: + - .ci-tron-v3d-rpi5-gl:arm64 + - .v3d-manual-rules + timeout: 1h + variables: + CI_TRON_TIMEOUT__OVERALL__MINUTES: 55 + DEQP_FRACTION: 1 + v3d-rpi5-rusticl:arm64: extends: - .igalia-bcm2712-rpi-5 @@ -240,6 +441,17 @@ v3d-rpi5-rusticl:arm64: variables: DEQP_SUITE: v3d-rusticl +.ci-tron-v3d-rpi5-rusticl:arm64: + extends: + - .ci-tron-arm64-test-gl + - .ci-tron-broadcom-rpi5:arm64 + - .test-piglit + - .v3d-rusticl-manual-rules + timeout: 30m + variables: + CI_TRON_TIMEOUT__OVERALL__MINUTES: 25 + DEQP_SUITE: v3d-rusticl + v3d-rpi5-traces:arm64: extends: - .igalia-bcm2712-rpi-5 @@ -267,6 +479,19 @@ v3dv-rpi5-vk:arm64: DEQP_FRACTION: 6 FLAKES_CHANNEL: "#videocore-ci" +.ci-tron-v3dv-rpi5-vk:arm64: + extends: + - .ci-tron-arm64-test-vk + - .ci-tron-broadcom-rpi5:arm64 + - .v3dv-rules + timeout: 25m + parallel: 2 + variables: + CI_TRON_TIMEOUT__OVERALL__MINUTES: 145 + HWCI_START_WESTON: 1 + DEQP_SUITE: broadcom-rpi5-vk + DEQP_FRACTION: 6 + v3dv-rpi5-vk-full:arm64: extends: - v3dv-rpi5-vk:arm64 @@ -282,6 +507,15 @@ v3dv-rpi5-vk-full:arm64: TEST_SETUP_AND_UPLOAD_MARGIN_MINUTES: 10 DEQP_FRACTION: 1 +.ci-tron-v3dv-rpi5-vk-full:arm64: + extends: + - .ci-tron-v3dv-rpi5-vk:arm64 + - .v3dv-manual-rules + timeout: 2h 30m + variables: + CI_TRON_TIMEOUT__OVERALL__MINUTES: 145 + DEQP_FRACTION: 1 + # This is quite unstable. Keep it disabled .rpi3-skqp:arm64: extends: @@ -293,6 +527,17 @@ v3dv-rpi5-vk-full:arm64: DEQP_SUITE: broadcom-rpi-skqp HWCI_START_WESTON: 1 +.ci-tron-rpi3-skqp:arm64: + extends: + - .ci-tron-arm64-test-gl + - .ci-tron-broadcom-rpi3:arm64 + - .vc4-manual-rules + timeout: 25m + variables: + CI_TRON_TIMEOUT__OVERALL__MINUTES: 20 + DEQP_SUITE: broadcom-rpi-skqp + HWCI_START_WESTON: 1 + rpi4-skqp:arm64: extends: - .igalia-bcm2711-rpi-4 @@ -305,6 +550,19 @@ rpi4-skqp:arm64: HWCI_START_WESTON: 1 FLAKES_CHANNEL: "#videocore-ci" +.ci-tron-rpi4-skqp:arm64: + extends: + - .ci-tron-arm64-test-gl + - .ci-tron-broadcom-rpi4:arm64 + # SKQP tests both the GL and VK drivers + - .v3d-v3dv-manual-rules + timeout: 25m + variables: + CI_TRON_TIMEOUT__OVERALL__MINUTES: 20 + DEQP_SUITE: broadcom-rpi-skqp + HWCI_START_WESTON: 1 + FLAKES_CHANNEL: "#videocore-ci" + rpi5-skqp:arm64: extends: - .igalia-bcm2712-rpi-5 @@ -316,3 +574,16 @@ rpi5-skqp:arm64: DEQP_SUITE: broadcom-rpi-skqp HWCI_START_WESTON: 1 FLAKES_CHANNEL: "#videocore-ci" + +.ci-tron-rpi5-skqp:arm64: + extends: + - .ci-tron-arm64-test-gl + - .ci-tron-broadcom-rpi5:arm64 + # SKQP tests both the GL and VK drivers + - .v3d-v3dv-manual-rules + timeout: 25m + variables: + CI_TRON_TIMEOUT__OVERALL__MINUTES: 20 + DEQP_SUITE: broadcom-rpi-skqp + HWCI_START_WESTON: 1 + FLAKES_CHANNEL: "#videocore-ci"