X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=.gitlab-ci.yml;h=2909d304e14fa1a1126e1515832a04f34b74d72b;hb=80049069265fe6457eba24949fc48e67c2a3d087;hp=e260420c5c7696eff440f605933185b6fd61f29f;hpb=a133f7d2885d4717b9af41396ed09d9ceba3aaf3;p=mesa.git diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e260420c5c7..2909d304e14 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -167,7 +167,7 @@ success: - *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/**/* @@ -180,7 +180,7 @@ success: 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 @@ -222,7 +222,7 @@ x86_build: extends: - .use-x86_build-base variables: - FDO_DISTRIBUTION_TAG: &x86_build "2020-07-28-x86-2" + FDO_DISTRIBUTION_TAG: &x86_build "2020-08-08-glvnd" .use-x86_build: variables: @@ -294,7 +294,7 @@ x86_test-base: x86_test-gl: extends: .use-x86_test-base variables: - FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-07-28-x86-2" + FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-08-14-xcb-shm" # Debian 10 based x86 test image for VK x86_test-vk: @@ -322,7 +322,7 @@ arm_build: - .fdo.container-build@debian@arm64v8 - .container variables: - FDO_DISTRIBUTION_TAG: &arm_build "2020-07-28-libdrm" + FDO_DISTRIBUTION_TAG: &arm_build "2020-08-04-nfs-2" .use-arm_build: variables: @@ -355,7 +355,7 @@ arm64_test: extends: - .use-arm_test-base variables: - FDO_DISTRIBUTION_TAG: &arm64_test "2020-08-04-ramdisk-fix" + FDO_DISTRIBUTION_TAG: &arm64_test "2020-08-18" .use-arm64_test: variables: @@ -382,7 +382,7 @@ arm64_test: 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 @@ -550,6 +550,7 @@ meson-gallium: -D gallium-nine=true -D gallium-opencl=disabled GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swr,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink" + VULKAN_DRIVERS: swrast EXTRA_OPTION: > -D osmesa=gallium -D tools=all @@ -574,6 +575,30 @@ meson-classic: -D tools=all -D werror=true +meson-android: + extends: .meson-build + variables: + UNWIND: "disabled" + DRI_LOADERS: > + -D glx=disabled + -D gbm=disabled + -D egl=enabled + -D platforms=android + GALLIUM_DRIVERS: freedreno + VULKAN_DRIVERS: freedreno,intel,amd + EXTRA_OPTION: > + -D android-stub=true + -D werror=true + GALLIUM_ST: > + -D dri3=disabled + -D gallium-vdpau=disabled + -D gallium-xvmc=disabled + -D gallium-omx=disabled + -D gallium-va=disabled + -D gallium-xa=disabled + -D gallium-nine=false + -D gallium-opencl=disabled + .meson-cross: extends: - .meson-build @@ -659,7 +684,7 @@ meson-clang: CC: "ccache clang-9" CXX: "ccache clang++-9" -.meson-windows-vs2019: +meson-windows-vs2019: extends: - .build-windows - .use-windows_build_vs2019 @@ -936,11 +961,21 @@ softpipe-gles31: 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 NIR_VALIDATE: 0 DEQP_NO_SAVE_RESULTS: 1 + DEQP_SKIPS: deqp-virgl-gl-skips.txt # Don't use threads inside llvmpipe, we've already got all cores # busy at the deqp-runner level. LP_NUM_THREADS: 0 @@ -1028,7 +1063,7 @@ arm64_a630_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: "" @@ -1077,6 +1112,7 @@ arm64_a630_traces: 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 @@ -1148,7 +1184,8 @@ arm64_a306_gles2: 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 @@ -1194,7 +1231,7 @@ arm64_a530_gles2: # 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: @@ -1257,6 +1294,9 @@ radv-fossils: # Navi10 (GFX10) - export RADV_FORCE_FAMILY="gfx1010" - ./install/fossilize-runner.sh + # Sienna Cichlid (GFX10) + - export RADV_FORCE_FAMILY="gfx1030" + - ./install/fossilize-runner.sh # Traces CI .traces-test: @@ -1289,6 +1329,7 @@ llvmpipe-traces: LIBGL_ALWAYS_SOFTWARE: "true" GALLIUM_DRIVER: "llvmpipe" DEVICE_NAME: "gl-vmware-llvmpipe" + DRIVER_NAME: "llvmpipe" radv-polaris10-traces: extends: @@ -1297,6 +1338,7 @@ radv-polaris10-traces: - .test-manual variables: DEVICE_NAME: "vk-amd-polaris10" + DRIVER_NAME: "radv" tags: - polaris10 @@ -1307,6 +1349,7 @@ radv-raven-traces: - .test-manual variables: DEVICE_NAME: "vk-amd-raven" + DRIVER_NAME: "radv" tags: - raven @@ -1318,5 +1361,6 @@ virgl-traces: 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"