- *ignore_scheduled_pipelines
# Run pipeline by default in the main project if any CI pipeline
# configuration files were changed, to ensure docker images are up to date
- - if: '$CI_PROJECT_PATH == "mesa/mesa"'
+ - if: '$CI_PROJECT_PATH == "mesa/mesa" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME'
changes:
- .gitlab-ci.yml
- .gitlab-ci/**/*
when: on_success
# Run pipeline by default in the main project if it was not triggered by
# Marge Bot, and any files affecting the pipeline were changed
- - if: '$GITLAB_USER_LOGIN != "marge-bot" && $CI_PROJECT_PATH == "mesa/mesa"'
+ - if: '$GITLAB_USER_LOGIN != "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME && $CI_PROJECT_PATH == "mesa/mesa"'
changes:
*all_paths
when: on_success
extends:
- .use-arm_test-base
variables:
- FDO_DISTRIBUTION_TAG: &arm64_test "2020-08-04-nfs-2"
+ FDO_DISTRIBUTION_TAG: &arm64_test "2020-08-18"
.use-arm64_test:
variables:
WINDOWS_IMAGE: "$CI_REGISTRY_IMAGE/windows/x64_build:$WINDOWS_TAG"
WINDOWS_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/windows/x64_build:$WINDOWS_TAG"
-.windows_build_vs2019:
+windows_build_vs2019:
extends:
- .container
- .windows-docker-vs2019
CC: "ccache clang-9"
CXX: "ccache clang++-9"
-.meson-windows-vs2019:
+meson-windows-vs2019:
extends:
- .build-windows
- .use-windows_build_vs2019
DEQP_VER: gles31
extends: softpipe-gles2
+# Note that KHR-GL3* test sets include all tests from the previous
+# version, so we only need to run one test list (unlike dEQP-GLES,
+# where the test sets are separate).
+softpipe-gl:
+ variables:
+ DEQP_VER: gl33
+ extends:
+ - softpipe-gles2
+
virgl-gles2-on-gl:
variables:
DEQP_VER: gles2
BM_KERNEL: /lava-files/cheza-kernel
BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8 root=/dev/nfs rw nfsrootdebug nfsroot=,tcp,nfsvers=4.2 init=/init"
DEQP_EXPECTED_FAILS: deqp-freedreno-a630-fails.txt
- DEQP_SKIPS: deqp-freedreno-a630-skips.txt
+ DEQP_FLAKES: deqp-freedreno-a630-flakes.txt
GIT_STRATEGY: none
DEQP_EXPECTED_RENDERER: FD630
DEQP_NO_SAVE_RESULTS: ""
variables:
BARE_METAL_TEST_SCRIPT: "/install/tracie-runner-gl.sh"
DEVICE_NAME: "freedreno-a630"
+ DRIVER_NAME: "freedreno"
TRACIE_NO_UNIT_TESTS: 1
TRACIE_UPLOAD_TO_MINIO: 1
# This lets us run several more traces which don't use any features we're
FLAKES_CHANNEL: "#freedreno-ci"
BARE_METAL_TEST_SCRIPT: "/install/deqp-runner.sh"
DEQP_EXPECTED_FAILS: deqp-freedreno-a307-fails.txt
- DEQP_SKIPS: deqp-freedreno-a307-skips.txt
+ DEQP_SKIPS: deqp-default-skips.txt
+ DEQP_FLAKES: deqp-freedreno-a307-flakes.txt
DEQP_VER: gles2
DEQP_PARALLEL: 4
DEQP_EXPECTED_RENDERER: FD307
# current upstream kernel.
BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8 nosmp"
DEQP_EXPECTED_FAILS: deqp-freedreno-a530-fails.txt
- DEQP_SKIPS: deqp-freedreno-a530-skips.txt
+ DEQP_FLAKES: deqp-freedreno-a530-flakes.txt
DEQP_EXPECTED_RENDERER: FD530
NIR_VALIDATE: 0
tags:
LIBGL_ALWAYS_SOFTWARE: "true"
GALLIUM_DRIVER: "llvmpipe"
DEVICE_NAME: "gl-vmware-llvmpipe"
+ DRIVER_NAME: "llvmpipe"
radv-polaris10-traces:
extends:
- .test-manual
variables:
DEVICE_NAME: "vk-amd-polaris10"
+ DRIVER_NAME: "radv"
tags:
- polaris10
- .test-manual
variables:
DEVICE_NAME: "vk-amd-raven"
+ DRIVER_NAME: "radv"
tags:
- raven
LIBGL_ALWAYS_SOFTWARE: "true"
GALLIUM_DRIVER: "virpipe"
DEVICE_NAME: "gl-virgl"
+ DRIVER_NAME: "virgl"
MESA_GLES_VERSION_OVERRIDE: "3.1"
MESA_GLSL_VERSION_OVERRIDE: "310"