From 91a6c9cccfacbe38addb5ba8f75f04871f8fd088 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 6 Apr 2023 14:32:48 +0100 Subject: [PATCH] Revert "broadcom/ci: run gl jobs on arm64, just like vk" This reverts commit ba4eeaf435f050dfec5472c7919b9b70e38d1bb8. Looks like we have a lot of memory issues on arm64; revert the pre-merge CI to armhf until we've been able to figure out the problem and fix it. Closes https://gitlab.freedesktop.org/mesa/mesa/-/issues/8788 Signed-off-by: Eric Engestrom Part-of: --- src/broadcom/ci/gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/broadcom/ci/gitlab-ci.yml b/src/broadcom/ci/gitlab-ci.yml index 8ae1624..71da783 100644 --- a/src/broadcom/ci/gitlab-ci.yml +++ b/src/broadcom/ci/gitlab-ci.yml @@ -17,9 +17,9 @@ variables: BM_BOOTFS: /boot/raspberrypi_armhf -vc4-rpi3-gl:arm64: +vc4-rpi3-gl:armhf: extends: - - .broadcom-test:arm64 + - .broadcom-test:armhf - .vc4-rules script: - ./install/bare-metal/poe-powered.sh @@ -32,9 +32,9 @@ vc4-rpi3-gl:arm64: DEQP_SUITE: broadcom-rpi3 HWCI_START_WESTON: 1 -v3d-rpi4-gl:arm64: +v3d-rpi4-gl:armhf: extends: - - .broadcom-test:arm64 + - .broadcom-test:armhf - .v3d-rules script: - ./install/bare-metal/poe-powered.sh -- 2.7.4