KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci/bare-metal: Consolidate needs declarations in .baremetal-test-*. 

We had it set up for arm64 asan already, do it for everyone else too.  In
cleaning up the duplication, this fixes a pasteo in rpi3 which had the
"artifacts: false" on the wrong job, causing it to do a slow download of
the mesa build from gitlab.

Doing this required also moving the ".use-debian/arm_test" in as well, so
that its "needs:" didn't overwrite ours if it appeared after us in the
consumer's "extends:"

Should save about 20 seconds on rpi3 jobs.

Reviewed-by: Juan A. Suarez <jasuarez@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17146>
This commit is contained in:
Emma Anholt 2022-06-20 11:51:40 -07:00 committed by Marge Bot
parent 1f9566cbb0
commit 13bf36588d
5 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.gitlab-ci/test/gitlab-ci.yml
View File

@ -138,21 +138,37 @@
reports:
junit: results/junit.xml
# ARM testing of bare-metal boards attached to an x86 gitlab-runner system
.baremetal-test-armhf:
extends:
- .baremetal-test
- .use-debian/arm_test
variables:
BM_ROOTFS: /rootfs-armhf
MINIO_ARTIFACT_NAME: mesa-armhf
needs:
- debian/arm_test
- job: debian-armhf
artifacts: false
# ARM64 testing of bare-metal boards attached to an x86 gitlab-runner system
.baremetal-test-arm64:
extends:
- .baremetal-test
- .use-debian/arm_test
variables:
BM_ROOTFS: /rootfs-arm64
MINIO_ARTIFACT_NAME: mesa-arm64
needs:
- debian/arm_test
- job: debian-arm64
artifacts: false
# ARM64 testing of bare-metal boards attached to an x86 gitlab-runner system, using an asan mesa build
.baremetal-arm64-asan-test:
extends:
- .baremetal-test
- .use-debian/arm_test
variables:
DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.6:/install/lib/libdlclose-skip.so"
MINIO_ARTIFACT_NAME: mesa-arm64-asan

17
src/broadcom/ci/gitlab-ci.yml
View File

@ -2,7 +2,6 @@
extends:
- .baremetal-test-armhf
- .vc4-rules
- .use-debian/arm_test
variables:
BM_BOOTFS: /boot/raspberrypi_armhf
GPU_VERSION: broadcom-rpi3
@ -10,10 +9,6 @@
FLAKES_CHANNEL: "#videocore-ci"
script:
- ./install/bare-metal/poe-powered.sh
needs:
- job: debian/arm_test
artifacts: false
- debian-armhf
tags:
- igalia-rpi3
@ -54,7 +49,6 @@ vc4-rpi3-piglit-quick_gl:armhf:
extends:
- .baremetal-test-armhf
- .v3d-rules
- .use-debian/arm_test
variables:
HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
BM_BOOTFS: /boot/raspberrypi_armhf
@ -98,7 +92,6 @@ v3d-rpi4-piglit:armhf:
extends:
- .baremetal-test-armhf
- .v3d-rules
- .use-debian/arm_test
variables:
HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
BM_BOOTFS: /boot/raspberrypi_armhf
@ -117,7 +110,6 @@ v3d-rpi4-traces:arm64:
extends:
- .piglit-traces-test
- .baremetal-test-arm64
- .use-debian/arm_test
- .v3d-rules
- .test-manual-mr
variables:
@ -135,17 +127,12 @@ v3d-rpi4-traces:arm64:
junit: results/junit.xml
script:
- ./install/bare-metal/poe-powered.sh
needs:
- debian/arm_test
- job: debian-arm64
artifacts: false
tags:
- igalia-rpi4
v3dv-rpi4-vk:arm64:
extends:
- .baremetal-test-arm64
- .use-debian/arm_test
- .v3dv-rules
parallel: 8
variables:
@ -160,9 +147,5 @@ v3dv-rpi4-vk:arm64:
VK_DRIVER: broadcom
script:
- ./install/bare-metal/poe-powered.sh
needs:
- debian/arm_test
- job: debian-arm64
artifacts: false
tags:
- igalia-rpi4

5
src/etnaviv/ci/gitlab-ci.yml
View File

@ -1,7 +1,6 @@
.etnaviv-armhf-test:
extends:
- .baremetal-test-armhf
- .use-debian/arm_test
- .etnaviv-rules
script:
- ./install/bare-metal/fastboot.sh
@ -9,10 +8,6 @@
BM_CMDLINE: "ip=dhcp console=ttymxc0,115200n8 root=/dev/nfs rw nfsrootdebug init=/init $BM_KERNELARGS"
BM_KERNEL: /baremetal-files/zImage
FLAKES_CHANNEL: "#etnaviv-ci"
needs:
- debian/arm_test
- job: debian-armhf
artifacts: false
.etnaviv-armhf-gc2000:
extends:

5
src/freedreno/ci/gitlab-ci.yml
View File

@ -1,7 +1,6 @@
.freedreno-test:
extends:
- .baremetal-test-arm64
- .use-debian/arm_test
- .freedreno-rules
variables:
FLAKES_CHANNEL: "#freedreno-ci"
@ -9,10 +8,6 @@
BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8 $BM_KERNEL_EXTRA_ARGS root=/dev/nfs rw nfsrootdebug nfsroot=,tcp,nfsvers=4.2 init=/init $BM_KERNELARGS"
script:
- ./install/bare-metal/fastboot.sh
needs:
- debian/arm_test
- job: debian-arm64
artifacts: false
tags:
- google-freedreno-db410c

5
src/gallium/drivers/nouveau/ci/gitlab-ci.yml
View File

@ -1,7 +1,6 @@
.gm20b-test:
extends:
- .baremetal-test-arm64
- .use-debian/arm_test
- .nouveau-rules
variables:
HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
@ -14,10 +13,6 @@
HWCI_KERNEL_MODULES: tegra-drm,nouveau
script:
- ./install/bare-metal/poe-powered.sh
needs:
- debian/arm_test
- job: debian-arm64
artifacts: false
tags:
- google-nouveau-jetson-nano