Module: Mesa Branch: main Commit: b9cdcd2cbe85bc10c8da7d0e3175bd352034b1aa URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b9cdcd2cbe85bc10c8da7d0e3175bd352034b1aa
Author: Eric Engestrom <[email protected]> Date: Mon Feb 6 18:45:17 2023 +0000 ci/android: move virgl-specific fails/flakes/skips lists to virgl-defined variables Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Helen Koike <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21157> --- .gitlab-ci/cuttlefish-runner.sh | 1 - src/gallium/drivers/virgl/ci/gitlab-ci.yml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci/cuttlefish-runner.sh b/.gitlab-ci/cuttlefish-runner.sh index 457bd586f25..fe81b0db3b4 100755 --- a/.gitlab-ci/cuttlefish-runner.sh +++ b/.gitlab-ci/cuttlefish-runner.sh @@ -54,7 +54,6 @@ MESA_ANDROID_ARTIFACT_URL=https://${PIPELINE_ARTIFACTS_BASE}/${MINIO_ARTIFACT_NA curl -L --retry 4 -f --retry-all-errors --retry-delay 60 -o ${MINIO_ARTIFACT_NAME}.tar.zst ${MESA_ANDROID_ARTIFACT_URL} tar -xvf ${MINIO_ARTIFACT_NAME}.tar.zst -GPU_VERSION=virgl-gl $ADB push install/all-skips.txt /data/. $ADB push install/$GPU_VERSION-flakes.txt /data/. $ADB push install/deqp-android-virgl.toml /data/. diff --git a/src/gallium/drivers/virgl/ci/gitlab-ci.yml b/src/gallium/drivers/virgl/ci/gitlab-ci.yml index 4c095105258..f0f62a4022d 100644 --- a/src/gallium/drivers/virgl/ci/gitlab-ci.yml +++ b/src/gallium/drivers/virgl/ci/gitlab-ci.yml @@ -111,3 +111,4 @@ android-virgl-llvmpipe: - .virgl-rules variables: ANDROID_GPU_MODE: drm_virgl + GPU_VERSION: virgl-gl
