mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-28 19:00:13 +01:00
ci: Rename x86_cross_arm_test to just arm_test.
This gets us back to the behavior we used to have for freedreno: clicking
play on arm_test gets you testing of the ARM platforms that aren't under
arm-build (the LAVA runners).
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
(cherry picked from commit 601a029e67)
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5548>
This commit is contained in:
parent
f1cd8a344e
commit
2f31c6b4e2
2 changed files with 8 additions and 8 deletions
|
|
@ -187,17 +187,17 @@ arm_build:
|
|||
- arm_build
|
||||
|
||||
# x86 image with ARM rootfses for baremetal testing.
|
||||
x86_cross_arm_test:
|
||||
arm_test:
|
||||
extends: x86_build
|
||||
variables:
|
||||
FDO_DISTRIBUTION_TAG: &x86_cross_arm_test "2020-05-28-cheza-2"
|
||||
FDO_DISTRIBUTION_TAG: &arm_test "2020-05-28-cheza-2"
|
||||
|
||||
.use-x86_cross_arm_test:
|
||||
.use-arm_test:
|
||||
variables:
|
||||
TAG: *x86_cross_arm_test
|
||||
image: "$CI_REGISTRY_IMAGE/debian/x86_cross_arm_test:$TAG"
|
||||
TAG: *arm_test
|
||||
image: "$CI_REGISTRY_IMAGE/debian/arm_test:$TAG"
|
||||
needs:
|
||||
- x86_cross_arm_test
|
||||
- arm_test
|
||||
|
||||
# Native Windows docker builds
|
||||
#
|
||||
|
|
@ -846,7 +846,7 @@ arm64_a630_gmem:
|
|||
arm64_a306_gles2:
|
||||
extends:
|
||||
- .baremetal-test
|
||||
- .use-x86_cross_arm_test
|
||||
- .use-arm_test
|
||||
- .freedreno-rules
|
||||
variables:
|
||||
BM_KERNEL: /lava-files/Image.gz
|
||||
|
|
@ -864,7 +864,7 @@ arm64_a306_gles2:
|
|||
script:
|
||||
- .gitlab-ci/bare-metal/fastboot.sh
|
||||
needs:
|
||||
- x86_cross_arm_test
|
||||
- arm_test
|
||||
- arm_build
|
||||
- meson-arm64
|
||||
tags:
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue