From 574bff908778b31726921ce9e517728e236ce39c Mon Sep 17 00:00:00 2001 From: Erico Nunes Date: Wed, 7 Jul 2021 22:54:43 +0200 Subject: [PATCH] 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 Part-of: --- .gitlab-ci.yml | 2 +- .gitlab-ci/container/lava_build.sh | 2 +- .gitlab-ci/lava/lava-gitlab-ci.yml | 1 + .gitlab-ci/lava/lava-submit.sh | 1 + .gitlab-ci/lava/lava_job_submitter.py | 3 ++- src/gallium/drivers/lima/ci/gitlab-ci.yml | 25 ++++++------------------- 6 files changed, 12 insertions(+), 22 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3977eeb..413f75a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -460,7 +460,7 @@ fedora/x86_build: variables: GIT_STRATEGY: fetch KERNEL_URL: *kernel-rootfs-url - MESA_ROOTFS_TAG: &kernel-rootfs "2021-08-03-piglit" + MESA_ROOTFS_TAG: &kernel-rootfs "2021-08-07-enable-lima" DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}" script: - .gitlab-ci/container/lava_build.sh diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index 288fb41..502e0f2 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 eb58978..1d8baf3 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 ecd2bba..2596679 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 917701a..60c4fac 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() diff --git a/src/gallium/drivers/lima/ci/gitlab-ci.yml b/src/gallium/drivers/lima/ci/gitlab-ci.yml index 5e59655..ee42f3c 100644 --- a/src/gallium/drivers/lima/ci/gitlab-ci.yml +++ b/src/gallium/drivers/lima/ci/gitlab-ci.yml @@ -1,28 +1,15 @@ -.lima-mali400-test:armhf: - parallel: 2 - extends: - - .lava-test:armhf - - .lima-rules - variables: - DEVICE_TYPE: sun8i-h3-libretech-all-h3-cc - DTB: ${DEVICE_TYPE} - GPU_VERSION: lima - DEQP_PARALLEL: 3 - DEQP_EXPECTED_RENDERER: Mali400 - - tags: - - mesa-ci-aarch64-lava-baylibre - -.lima-mali450-test:arm64: +lima-mali450-test:arm64: extends: - .lava-test:arm64 - .lima-rules variables: - DEVICE_TYPE: meson-gxl-s905x-libretech-cc + DEVICE_TYPE: meson-gxl-s805x-libretech-ac DTB: ${DEVICE_TYPE} + FDO_HTTP_CACHE_URI: '' GPU_VERSION: lima - DEQP_PARALLEL: 6 + DEQP_PARALLEL: 4 DEQP_EXPECTED_RENDERER: Mali450 + VISIBILITY_GROUP: "mesa-ci" tags: - - mesa-ci-aarch64-lava-baylibre + - mesa-ci-x86-64-lava-lima -- 2.7.4