ci: Rename ANDROID_GPU_MODE to CUTTLEFISH_GPU_MODE
Makes the variable name more clear. Signed-off-by: Valentine Burley <valentine.burley@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37738>
This commit is contained in:
committed by
Marge Bot
parent
c63c695149
commit
1bca7ca3e0
@@ -60,7 +60,7 @@ VSOCK_CID=$((VSOCK_BASE + (CI_JOB_ID & 0xfff)))
|
||||
|
||||
# Venus requires a custom kernel for now
|
||||
CUSTOM_KERNEL_ARGS=""
|
||||
if [ "$ANDROID_GPU_MODE" = "venus" ] || [ "$ANDROID_GPU_MODE" = "venus_guest_angle" ]; then
|
||||
if [ "$CUTTLEFISH_GPU_MODE" = "venus" ] || [ "$CUTTLEFISH_GPU_MODE" = "venus_guest_angle" ]; then
|
||||
CUSTOM_KERNEL_ARGS="
|
||||
-kernel_path=/cuttlefish/bzImage
|
||||
-initramfs_path=/cuttlefish/initramfs.img
|
||||
@@ -79,7 +79,7 @@ HOME=/cuttlefish launch_cvd \
|
||||
-enable_modem_simulator=false \
|
||||
-guest_enforce_security=false \
|
||||
-report_anonymous_usage_stats=no \
|
||||
-gpu_mode="$ANDROID_GPU_MODE" \
|
||||
-gpu_mode="$CUTTLEFISH_GPU_MODE" \
|
||||
-cpus=${FDO_CI_CONCURRENT:-4} \
|
||||
-memory_mb ${CUTTLEFISH_MEMORY:-4096} \
|
||||
$CUSTOM_KERNEL_ARGS
|
||||
|
||||
@@ -75,7 +75,7 @@ llvmpipe-deqp-asan:
|
||||
- .test-android
|
||||
- .llvmpipe-rules
|
||||
variables:
|
||||
ANDROID_GPU_MODE: mesa_swrast
|
||||
CUTTLEFISH_GPU_MODE: mesa_swrast
|
||||
GPU_VERSION: llvmpipe
|
||||
DEQP_SUITE: android-llvmpipe
|
||||
# TODO: define DEQP_FRACTION?
|
||||
|
||||
@@ -70,6 +70,6 @@ virgl-traces:
|
||||
- .test-android
|
||||
- .virgl-rules
|
||||
variables:
|
||||
ANDROID_GPU_MODE: drm_virgl
|
||||
CUTTLEFISH_GPU_MODE: drm_virgl
|
||||
GPU_VERSION: virgl-gl
|
||||
DEQP_SUITE: android-virgl
|
||||
|
||||
@@ -61,7 +61,7 @@ lavapipe-vkd3d:
|
||||
|
||||
android-angle-lavapipe:
|
||||
variables:
|
||||
ANDROID_GPU_MODE: mesa_swrast_guest_angle
|
||||
CUTTLEFISH_GPU_MODE: mesa_swrast_guest_angle
|
||||
DEQP_SUITE: android-angle-lavapipe
|
||||
GPU_VERSION: lvp-android-angle
|
||||
timeout: 15m
|
||||
@@ -72,7 +72,7 @@ android-angle-lavapipe:
|
||||
|
||||
android-angle-lavapipe-cts:
|
||||
variables:
|
||||
ANDROID_GPU_MODE: mesa_swrast_guest_angle
|
||||
CUTTLEFISH_GPU_MODE: mesa_swrast_guest_angle
|
||||
GPU_VERSION: lvp-android-angle
|
||||
timeout: 15m
|
||||
extends:
|
||||
|
||||
@@ -60,5 +60,5 @@
|
||||
- .anv-test
|
||||
- .test-angle
|
||||
variables:
|
||||
ANDROID_GPU_MODE: venus_guest_angle
|
||||
CUTTLEFISH_GPU_MODE: venus_guest_angle
|
||||
VK_DRIVER: intel
|
||||
|
||||
@@ -31,7 +31,7 @@ venus-lavapipe-full:
|
||||
- .test-android
|
||||
- .venus-lavapipe-manual-rules
|
||||
variables:
|
||||
ANDROID_GPU_MODE: venus
|
||||
CUTTLEFISH_GPU_MODE: venus
|
||||
GPU_VERSION: venus
|
||||
DEQP_SUITE: android-venus
|
||||
# TODO: define DEQP_FRACTION?
|
||||
@@ -42,7 +42,7 @@ venus-lavapipe-full:
|
||||
- .venus-lavapipe-manual-rules
|
||||
- .test-angle
|
||||
variables:
|
||||
ANDROID_GPU_MODE: venus_guest_angle
|
||||
CUTTLEFISH_GPU_MODE: venus_guest_angle
|
||||
GPU_VERSION: venus
|
||||
DEQP_SUITE: android-venus-angle
|
||||
# TODO: define DEQP_FRACTION?
|
||||
|
||||
Reference in New Issue
Block a user