diff options
| author | Erico Nunes <nunes.erico@gmail.com> | 2021-07-07 22:54:43 +0200 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-08-17 11:22:59 +0000 |
| commit | 574bff908778b31726921ce9e517728e236ce39c (patch) | |
| tree | 80b953827f2c9f472537caadee7a88774fb170df /.gitlab-ci | |
| parent | 46d0126deb82b46c2d7bdadb228e1721b4f485f7 (diff) | |
| download | mesa-574bff908778b31726921ce9e517728e236ce39c.tar.gz | |
ci: enable CI for lima again
Enable CI for lima again on meson-gxl-s805x-libretech-ac boards
with Mali-450.
These boards are managed by a LAVA instance and so follow the LAVA CI
workflow in Mesa.
The goal is to have coverage for deqp-gles2, as lima is a GLES2-only
driver.
Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11789>
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/container/lava_build.sh | 2 | ||||
| -rwxr-xr-x | .gitlab-ci/lava/lava-gitlab-ci.yml | 1 | ||||
| -rwxr-xr-x | .gitlab-ci/lava/lava-submit.sh | 1 | ||||
| -rwxr-xr-x | .gitlab-ci/lava/lava_job_submitter.py | 3 |
4 files changed, 5 insertions, 2 deletions
diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index 288fb41bfe2..502e0f2f6b3 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -27,7 +27,7 @@ if [[ "$DEBIAN_ARCH" = "arm64" ]]; then KERNEL_ARCH="arm64" DEFCONFIG="arch/arm64/configs/defconfig" DEVICE_TREES="arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dtb" - DEVICE_TREES+=" arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb" + DEVICE_TREES+=" arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dtb" DEVICE_TREES+=" arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dtb" DEVICE_TREES+=" arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb" DEVICE_TREES+=" arch/arm64/boot/dts/qcom/apq8016-sbc.dtb" diff --git a/.gitlab-ci/lava/lava-gitlab-ci.yml b/.gitlab-ci/lava/lava-gitlab-ci.yml index eb58978b7cf..1d8baf31327 100755 --- a/.gitlab-ci/lava/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava/lava-gitlab-ci.yml @@ -18,6 +18,7 @@ JOB_ROOTFS_OVERLAY_PATH: "${JOB_ARTIFACTS_BASE}/job-rootfs-overlay.tar.gz" JOB_RESULTS_PATH: "${JOB_ARTIFACTS_BASE}/results.tar.gz" PIGLIT_NO_WINDOW: 1 + VISIBILITY_GROUP: "Collabora+fdo" script: - ./artifacts/lava/lava-submit.sh artifacts: diff --git a/.gitlab-ci/lava/lava-submit.sh b/.gitlab-ci/lava/lava-submit.sh index ecd2bba1cf7..2596679276c 100755 --- a/.gitlab-ci/lava/lava-submit.sh +++ b/.gitlab-ci/lava/lava-submit.sh @@ -42,4 +42,5 @@ artifacts/lava/lava_job_submitter.py \ --kernel-image-name ${KERNEL_IMAGE_NAME} \ --kernel-image-type "${KERNEL_IMAGE_TYPE}" \ --boot-method ${BOOT_METHOD} \ + --visibility-group ${VISIBILITY_GROUP} \ --lava-tags "${LAVA_TAGS}" >> results/lava.log diff --git a/.gitlab-ci/lava/lava_job_submitter.py b/.gitlab-ci/lava/lava_job_submitter.py index 917701a7747..60c4fac62bb 100755 --- a/.gitlab-ci/lava/lava_job_submitter.py +++ b/.gitlab-ci/lava/lava_job_submitter.py @@ -50,7 +50,7 @@ def generate_lava_yaml(args): values = { 'job_name': 'mesa: {}'.format(args.pipeline_info), 'device_type': args.device_type, - 'visibility': { 'group': [ 'Collabora+fdo'] }, + 'visibility': { 'group': [ args.visibility_group ] }, 'priority': 75, 'context': { 'extra_nfsroot_args': ' init=/init rootwait minio_results={}'.format(args.job_artifacts_base) @@ -295,6 +295,7 @@ if __name__ == '__main__': parser.add_argument("--jwt") parser.add_argument("--validate-only", action='store_true') parser.add_argument("--dump-yaml", action='store_true') + parser.add_argument("--visibility-group") parser.set_defaults(func=main) args = parser.parse_args() |